Connection refactoring
Connection Handler