Update for complex CAPHeader