Add better missing field data processing