Added field mappings