Updating archetype docs and annotations