Update for old attributes syntax @key [ values… ] -> @key values...