Boilerplate field mapping fixed.