add Singleton and Note