Updated role controller and model