Add support for the mapping table