Updated archetypes