Singleton Class Added
Factory added