#3 Modify archetype persistence and validation (finished).