Adding support for multiple connectors
(partly done)
Adding support for multiple connectors