Added support for character mapping.