Consolidate router into connection