changes in datasource structure