Working on FactoryGroupHandling