Migrate to multirole system (stage 1)
Migrate to multirole system (stage 2)