Refactoring the ConnectionItem
Refactoring the ConnectionItem