Added scope checking to connectors