continuing conversion from ServiceLocator to ServiceLoader