Renamed to SingletonFactory