Add generic singleton
Change name of Singleton class