modified some datasource and resource settings