TASK 10: archetype enhancements and reconcile against ISAAC-PA changes.