Update Archetypes to final