diff --git a/DummyClient/Program.cs b/DummyClient/Program.cs
index 631e14d13e36daf830236bf87cb9f4d79ed43099..7afa90f454f46499e62e88ed1af8e64b941d4a06 100644
--- a/DummyClient/Program.cs
+++ b/DummyClient/Program.cs
@@ -38,10 +38,14 @@ void FluentSubscriberCall() {
 }
 
 
+ILogger logger = new Logger<AppDomain>(new NullLoggerFactory());
+client = new Client(
+    FitConnectEndpoints.Create(FitConnectEndpoints.EndpointType.Development),
+    "clientId", "clientSecret",
+    logger: logger);
+
 Console.WriteLine(
     "This is a dummy client to demonstrate the usage of the FitConnect SDK for .NET");
 
-_logger = new Logger<AppDomain>(new NullLoggerFactory());
-client =
-    new Client(FitConnectEndpoints.Create(FitConnectEndpoints.EndpointType.Development),
-        logger: _logger);
+FluentSenderCall();
+FluentSubscriberCall();
diff --git a/FitConnect/DiContainer.cs b/FitConnect/DiContainer.cs
index caf97717349d140ae1e7ec4c7dc395e9d25b7f5c..fcb48a51223975c5e791695214ec9f3e71c36d69 100644
--- a/FitConnect/DiContainer.cs
+++ b/FitConnect/DiContainer.cs
@@ -35,7 +35,7 @@ public static class DiContainer {
 
         builder.RegisterType<Client>();
         builder.Register(c => new OAuthService(endpoints.TokenUrl)).As<IOAuthService>();
-        builder.Register(c => new SubmissionService(endpoints.SubmissionUrl))
+        builder.Register(c => new SubmissionService(endpoints.SubmissionUrl[0]))
             .As<ISubmissionService>();
         builder.Register(c => new RouteService(endpoints.RoutingUrl)).As<IRouteService>();
 
@@ -43,7 +43,7 @@ public static class DiContainer {
             endpoints,
             senderCertificate!,
             new OAuthService(endpoints.TokenUrl),
-            new SubmissionService(endpoints.SubmissionUrl),
+            new SubmissionService(endpoints.SubmissionUrl[0]),
             new RouteService(endpoints.RoutingUrl),
             logger)).As<Sender>();
 
@@ -51,7 +51,7 @@ public static class DiContainer {
             endpoints,
             senderCertificate!,
             new OAuthService(endpoints.TokenUrl),
-            new SubmissionService(endpoints.SubmissionUrl),
+            new SubmissionService(endpoints.SubmissionUrl[0]),
             new RouteService(endpoints.RoutingUrl),
             logger)).As<Subscriber>();
 
diff --git a/FitConnect/FunctionalBaseClass.cs b/FitConnect/FunctionalBaseClass.cs
index 7c69030de2a2bd5a418073d98f2a4e2017ede65a..980ddc3bfdc885882f3f8a019c62b2c043ffaa81 100644
--- a/FitConnect/FunctionalBaseClass.cs
+++ b/FitConnect/FunctionalBaseClass.cs
@@ -1,18 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
 using System.Security.Cryptography;
 using System.Text;
-using System.Threading.Tasks;
 using FitConnect.Models;
 using Microsoft.Extensions.Logging;
 
 namespace FitConnect;
 
 
-
 public abstract class FunctionalBaseClass {
     protected readonly ILogger? logger;
     private RSA _rsa;
diff --git a/Models/FitConnectEndpoints.cs b/Models/FitConnectEndpoints.cs
index f044d8e51f43f290156e759a5e42caa40e1aa129..bfd93c000fe69a3a994d874a1255f8123fb9880b 100644
--- a/Models/FitConnectEndpoints.cs
+++ b/Models/FitConnectEndpoints.cs
@@ -9,19 +9,19 @@ public class FitConnectEndpoints {
 
     private static readonly FitConnectEndpoints DevEndpoints = new(
         "https://auth-testing.fit-connect.fitko.dev/token",
-        "https://submission-api-testing.fit-connect.fitko.dev",
+        new []{"https://submission-api-testing.fit-connect.fitko.dev"},
         "https://routing-api-testing.fit-connect.fitko.dev"
     );
 
     private static readonly FitConnectEndpoints TestEndpoints = new(
         "https://auth-testing.fit-connect.fitko.dev/token",
-        "https://submission-api-testing.fit-connect.fitko.dev",
+        new []{"https://submission-api-testing.fit-connect.fitko.dev"},
         "https://routing-api-testing.fit-connect.fitko.dev"
     );
 
     private static readonly FitConnectEndpoints ProductionEndpoints = new(
         "https://auth-testing.fit-connect.fitko.dev/token",
-        "https://submission-api-testing.fit-connect.fitko.dev",
+        new []{"https://submission-api-testing.fit-connect.fitko.dev"},
         "https://routing-api-testing.fit-connect.fitko.dev"
     );
 
@@ -31,7 +31,7 @@ public class FitConnectEndpoints {
     /// <param name="tokenUrl">URL for receiving the OAuth token</param>
     /// <param name="submissionUrl">URL for the submission API</param>
     /// <param name="routingUrl">URL for the routing API</param>
-    public FitConnectEndpoints(string tokenUrl, string submissionUrl, string routingUrl) {
+    public FitConnectEndpoints(string tokenUrl, string[] submissionUrl, string routingUrl) {
         TokenUrl = tokenUrl;
         SubmissionUrl = submissionUrl;
         RoutingUrl = routingUrl;
@@ -45,7 +45,7 @@ public class FitConnectEndpoints {
     /// <summary>
     ///     URL for the submission API.
     /// </summary>
-    public string SubmissionUrl { get; }
+    public string[] SubmissionUrl { get; }
 
     /// <summary>
     ///     URL for the routing API.