Refactored archetype structure