Issue #103: Updated archetypes