ServiceContext changes to allow for dynamic service discovery