Merged codes with latest DdmDatasetModule