Updated with field mapping