Refactoring connector new