tweak
Add Singleton pattern