Add MAPC-LEAF-NODES/DO-LEAF-NODES