Tidy up keys, add common role.