Modularize and expand MAEC-producing functions