Improved metadata