Formatting and add curated schema