Refactoring APIs with dlt

TODO - Determine dlt code is correct