Singleton improvement