Add support for mapping single name input