Complete refactoring Connections