Added MetadataGenerator