Started using ServiceLocator, experimental