Re-organised / Added attachments for AAF, FIA, NATO