[ artf672433] archetype refactoring