Updated for new roles/profiles module