Changes due to error resolution and updated archetype version