Improvements to metadata utilities