Refactor archetype