Update roles to reflect latest JSON definitions