Changes in response to Team review.
Updated other contributors of the archetype.