Added Metadata and MetadataEntry