Extract common service registry

Consider this a prompt for discussion. I think it's a sensible direction, but there might be better approaches.