diff --git a/RaceLapTimer/RaceLapTimer/Extensions/FileExport/FileExportManager.cs b/RaceLapTimer/RaceLapTimer/Extensions/FileExport/FileExportManager.cs
index b848860..a804022 100644
--- a/RaceLapTimer/RaceLapTimer/Extensions/FileExport/FileExportManager.cs
+++ b/RaceLapTimer/RaceLapTimer/Extensions/FileExport/FileExportManager.cs
@@ -19,11 +19,22 @@ namespace RaceLapTimer.Extensions.FileExport
             return _exporters;
         }
 
-        public Stream Export(string fileContent, string baseUrl)
+        public void Export(string exportType, string fileContent, string baseUrl, out Stream exportStream)
         {
-            if(_exporters.Any())
-                return _exporters.First().Export(fileContent, baseUrl);
-            return new MemoryStream();
+            if (_exporters.Any())
+            {
+                var exporter = _exporters.FirstOrDefault(x => x.GetDetails().Type == exportType);
+                if (exporter != null)
+                {
+                    exporter.Export(fileContent, baseUrl, out exportStream);
+                }
+                else
+                {
+                    exportStream = new MemoryStream();
+                }
+            }
+            else
+                exportStream = new MemoryStream();
         }
 
         public List<ExportProviderDetails> GetExporterDetails()