diff --git a/extensions/data-transfer/portability-data-transfer-flickr/src/main/java/org/datatransferproject/datatransfer/flickr/FlickrTransferExtension.java b/extensions/data-transfer/portability-data-transfer-flickr/src/main/java/org/datatransferproject/datatransfer/flickr/FlickrTransferExtension.java
index 1d9aa466a..2e0cd8a4d 100644
--- a/extensions/data-transfer/portability-data-transfer-flickr/src/main/java/org/datatransferproject/datatransfer/flickr/FlickrTransferExtension.java
+++ b/extensions/data-transfer/portability-data-transfer-flickr/src/main/java/org/datatransferproject/datatransfer/flickr/FlickrTransferExtension.java
@@ -17,23 +17,26 @@
 package org.datatransferproject.datatransfer.flickr;
 
 import static java.lang.String.format;
+import static org.datatransferproject.types.common.models.DataVertical.MEDIA;
 import static org.datatransferproject.types.common.models.DataVertical.PHOTOS;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
 import org.datatransferproject.api.launcher.ExtensionContext;
 import org.datatransferproject.api.launcher.Monitor;
+import org.datatransferproject.datatransfer.flickr.media.FlickrMediaImporter;
 import org.datatransferproject.datatransfer.flickr.photos.FlickrPhotosExporter;
 import org.datatransferproject.datatransfer.flickr.photos.FlickrPhotosImporter;
 import org.datatransferproject.spi.cloud.storage.AppCredentialStore;
 import org.datatransferproject.spi.cloud.storage.TemporaryPerJobDataStore;
+import org.datatransferproject.spi.transfer.extension.TransferExtension;
 import org.datatransferproject.spi.transfer.idempotentexecutor.IdempotentImportExecutor;
 import org.datatransferproject.spi.transfer.idempotentexecutor.IdempotentImportExecutorExtension;
-import org.datatransferproject.types.common.models.DataVertical;
-import org.datatransferproject.spi.transfer.extension.TransferExtension;
 import org.datatransferproject.spi.transfer.provider.Exporter;
 import org.datatransferproject.spi.transfer.provider.Importer;
+import org.datatransferproject.types.common.models.DataVertical;
 import org.datatransferproject.types.transfer.auth.AppCredentials;
 import org.datatransferproject.types.transfer.serviceconfig.TransferServiceConfig;
 
@@ -43,13 +46,13 @@ public class FlickrTransferExtension implements TransferExtension {
   private static final String FLICKR_KEY = "FLICKR_KEY";
   private static final String FLICKR_SECRET = "FLICKR_SECRET";
 
-  private final Set<DataVertical> supportedServices = ImmutableSet.of(PHOTOS);
+  private final Set<DataVertical> supportedServices = ImmutableSet.of(PHOTOS, MEDIA);
 
-  private Importer importer;
   private Exporter exporter;
   private TemporaryPerJobDataStore jobStore;
   private boolean initialized = false;
   private AppCredentials appCredentials;
+  private ImmutableMap<DataVertical, Importer> importerMap;
 
   @Override
   public String getServiceId() {
@@ -67,7 +70,7 @@ public String getServiceId() {
   public Importer<?, ?> getImporter(DataVertical transferDataType) {
     Preconditions.checkArgument(initialized);
     Preconditions.checkArgument(supportedServices.contains(transferDataType));
-    return importer;
+    return importerMap.get(transferDataType);
   }
 
   @Override
@@ -98,7 +101,20 @@ public void initialize(ExtensionContext context) {
         IdempotentImportExecutorExtension.class).getRetryingIdempotentImportExecutor(context);
     boolean enableRetrying = context.getSetting("enableRetrying", false);
 
-    importer = new FlickrPhotosImporter(appCredentials, jobStore, monitor, serviceConfig, idempotentImportExecutor, enableRetrying);
+    ImmutableMap.Builder<DataVertical, Importer> importerBuilder = ImmutableMap.builder();
+    importerBuilder.put(
+        PHOTOS,
+        new FlickrPhotosImporter(
+            appCredentials,
+            jobStore,
+            monitor,
+            serviceConfig,
+            idempotentImportExecutor,
+            enableRetrying));
+    importerBuilder.put(
+        MEDIA, new FlickrMediaImporter(appCredentials, jobStore, monitor, serviceConfig));
+    importerMap = importerBuilder.build();
+
     exporter = new FlickrPhotosExporter(appCredentials, serviceConfig);
     initialized = true;
   }