Enhance Singleton Case
Enhance Singleton Case