refactoring connectors