General improvements; remap to generic roles.