Updated datasource for AWS connection