Merged router into service, services now support multiple connections