Started factoring direct connections.
Factoring of Direct connections class.