Outgoing connection refactor