Additional work on the archetype section to match the latest AOM/AML