- Fixed serviceLocator call to use global service locator