More networking updates to service and manager