Improvements in Singleton