Added better connection factor builder