Adding custom field mapping as requested in #192