Added Singleton
Added Singleton