MVP-277 Updated to work with new roles implementation