Initial MAEC 4.0 commit