Add more tokens in
Fix up roles.