Improve the metadata