added connection pooling and more datasource options