Made header-field subelements more flexible, like conditional-field and default-field