Renamed Singleton-class