Update for MAEC 4 and Cybox 2