Improve adapter connection logic

[mvdgun]

In some adapters building a connection requires a lot of code. Figure out a way to improve building connections for the adapters.