Update to match new role annotation syntax.