Updated archetype structure