Updated for MAEC v4.0.1