Added per role upgrades