straightened out responsibilities between connection mgr and data source