Singleton updated