Added Connector and IBuffer