Refactoring of the IConnector seems to be working.