Fixed the ConnectorBuilder interface and its helpers