Refactoring connection delegation