Connector - First version finished