Move shared Connector functionality to Connect class