Simple changes to metadata classa and metadataservice