Add support for mapc