changes in data source initialization