Updated role model