[arctic-wolf] - Refactor code for role mgmt.