Refactoring Connection. No ready implementation jet.