Update to include newer fields from the schema