Added support for mapping to values