Update demo entities to latest RBAC