Merging CSDILA config changes.
Added ConnectionsInfo, removed Pair, some tidy up.
Refactoring based on Sonar reccomendations.