Refactored Connection listener. Sorted includes list.