HCOLL-23 refactored the ServerConnector and ClientConnector