Use new role wrapper