[DataSource] Refactored and cleaned up how connections are loaded up.
Resolving conflicts