Fully replaced ServiceLocator