Added metadataValidator option