Addational changes to the Connector