Updated with generated archetype