Add support for extra inline mappings