Updated datasource with new environment