Added option for setting Metadata ID separately from entityID for MetadataGenerator.