WIP Update to new role interface 0.53+