Refactoring: migrate to Singleton. Go To Declaration