Update to schema and added field descriptions