Services should now generate the correct set of SOS connectors

I think a couple of these might be removed, so we may have an issue there.