Now updates it to support the dynamic registration of clients