Improve archetype