Improved metadata dictionary usage