Add support for mapped values