Improve data source connection handling.