Adds support for mapc