Adds service registration and retrieval infrastructure