Refactoring the ConnectionItem