Singleton Refactor