Added Connector support.