Base: Add support for connectors