some changes to datasource