Improvements to metadata