Add proper handling of universes in Factions