Updated control field mappings and added internalRemark.