Moved class dictionary into Singleton class