Offset fix.
Connector implementation integrated