diff --git a/src/RobinTTY.NordigenApiClient/NordigenClient.cs b/src/RobinTTY.NordigenApiClient/NordigenClient.cs
index 53db10b..37f9853 100644
--- a/src/RobinTTY.NordigenApiClient/NordigenClient.cs
+++ b/src/RobinTTY.NordigenApiClient/NordigenClient.cs
@@ -20,6 +20,33 @@ public class NordigenClient : INordigenClient
     internal readonly NordigenClientCredentials Credentials;
     private JsonWebTokenPair? _jsonWebTokenPair;
 
+    /// <inheritdoc />
+    public JsonWebTokenPair? JsonWebTokenPair
+    {
+        get => _jsonWebTokenPair;
+        set
+        {
+            _jsonWebTokenPair = value;
+            if (value is not null)
+                TokenPairUpdated?.Invoke(this, new TokenPairUpdatedEventArgs(value));
+        }
+    }
+
+    /// <inheritdoc />
+    public ITokenEndpoint TokenEndpoint { get; }
+
+    /// <inheritdoc />
+    public IInstitutionsEndpoint InstitutionsEndpoint { get; }
+
+    /// <inheritdoc />
+    public IAgreementsEndpoint AgreementsEndpoint { get; }
+
+    /// <inheritdoc />
+    public IRequisitionsEndpoint RequisitionsEndpoint { get; }
+
+    /// <inheritdoc />
+    public IAccountsEndpoint AccountsEndpoint { get; }
+
     /// <summary>
     /// Creates a new instance of <see cref="NordigenClient" />.
     /// </summary>
@@ -49,33 +76,6 @@ public NordigenClient(HttpClient httpClient, NordigenClientCredentials credentia
         AccountsEndpoint = new AccountsEndpoint(this);
     }
 
-    /// <inheritdoc />
-    public JsonWebTokenPair? JsonWebTokenPair
-    {
-        get => _jsonWebTokenPair;
-        set
-        {
-            _jsonWebTokenPair = value;
-            if (value is not null)
-                TokenPairUpdated?.Invoke(this, new TokenPairUpdatedEventArgs(value));
-        }
-    }
-
-    /// <inheritdoc />
-    public ITokenEndpoint TokenEndpoint { get; }
-
-    /// <inheritdoc />
-    public IInstitutionsEndpoint InstitutionsEndpoint { get; }
-
-    /// <inheritdoc />
-    public IAgreementsEndpoint AgreementsEndpoint { get; }
-
-    /// <inheritdoc />
-    public IRequisitionsEndpoint RequisitionsEndpoint { get; }
-
-    /// <inheritdoc />
-    public IAccountsEndpoint AccountsEndpoint { get; }
-
     /// <inheritdoc />
     public event EventHandler<TokenPairUpdatedEventArgs>? TokenPairUpdated;