Missed some more things with regards to the ServiceRegistry thingy