[Improved] Faction support