Update to handle H+ and added handling for none recognized fields.