restructuring to use roles/profiles