Modified files to use ndatasource based datasource
Removed old datasource dependency