Switched to getServiceLocator method