change method names in datasource and adapt queries