Improvements to DataSourceConnector