Refactoring ConnectionFactoring