Changed logging source
Implemented the rest of Connector