Update metadata and add boilerplate data validation