Added the ConnectorAdapter
Resolved conflicts