Added service locator and toolbar service.