Connectivity engine refactoring