Connection module refactored