More changes from archetype