Connectors and a few changes
Connector classes