Update to include multi value field mapping