SingleConnectionManager refactoring