Singleton classes added