diff --git a/dspace-api/src/main/java/org/dspace/external/service/impl/ExternalDataServiceImpl.java b/dspace-api/src/main/java/org/dspace/external/service/impl/ExternalDataServiceImpl.java
index 21cf9d30fb..611d24e9f0 100644
--- a/dspace-api/src/main/java/org/dspace/external/service/impl/ExternalDataServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/external/service/impl/ExternalDataServiceImpl.java
@@ -16,6 +16,7 @@ import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.content.Collection;
 import org.dspace.content.Item;
+import org.dspace.content.MetadataValueDTO;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.content.service.InstallItemService;
 import org.dspace.content.service.ItemService;
@@ -24,7 +25,6 @@ import org.dspace.core.Context;
 import org.dspace.external.model.ExternalDataObject;
 import org.dspace.external.provider.ExternalDataProvider;
 import org.dspace.external.service.ExternalDataService;
-import org.dspace.mock.MockMetadataValue;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -102,11 +102,11 @@ public class ExternalDataServiceImpl implements ExternalDataService {
         }
         WorkspaceItem workspaceItem = workspaceItemService.create(context, collection, true);
         Item item = workspaceItem.getItem();
-        for (MockMetadataValue mockMetadataValue : externalDataObject.getMetadata()) {
-            itemService.addMetadata(context, item, mockMetadataValue.getSchema(), mockMetadataValue.getElement(),
-                                    mockMetadataValue.getQualifier(), mockMetadataValue.getLanguage(),
-                                    mockMetadataValue.getValue(), mockMetadataValue.getAuthority(),
-                                    mockMetadataValue.getConfidence());
+        for (MetadataValueDTO metadataValueDTO : externalDataObject.getMetadata()) {
+            itemService.addMetadata(context, item, metadataValueDTO.getSchema(), metadataValueDTO.getElement(),
+                                    metadataValueDTO.getQualifier(), metadataValueDTO.getLanguage(),
+                                    metadataValueDTO.getValue(), metadataValueDTO.getAuthority(),
+                                    metadataValueDTO.getConfidence());
         }
 
         return installItemService.installItem(context, workspaceItem);
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRestRepository.java
index ac0f833d41..b9204eb280 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRestRepository.java
@@ -27,8 +27,8 @@ import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.BundleRest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.model.patch.Patch;
-import org.dspace.app.rest.repository.handler.service.UriListHandlerService;
 import org.dspace.app.rest.projection.Projection;
+import org.dspace.app.rest.repository.handler.service.UriListHandlerService;
 import org.dspace.app.rest.repository.patch.ItemPatch;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bundle;
@@ -41,7 +41,6 @@ import org.dspace.content.service.InstallItemService;
 import org.dspace.content.service.ItemService;
 import org.dspace.content.service.WorkspaceItemService;
 import org.dspace.core.Context;
-import org.dspace.external.service.ExternalDataService;
 import org.dspace.util.UUIDUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;