New tag definitions. Updated template. Enhancements for duplicate headers.