Adding Singleton refactoring