Refactored archetype