Convert CDS implementation to use msdal APIs