Replaced uses of MetadataConstants with the new Dictionary and Metadata classes