Add wrappers for Connectors