Fix mda and add LIST support to cpp