Updated datasource connection pooling