[Upg] Refactor as roles