Updated arquetypes