Fix schema, add missing fields
Fix schema, add missing fields