Improve factories for systemgroups and hosts