diff --git a/library/src/main/java/cloud/pace/sdk/PACECloudSDK.kt b/library/src/main/java/cloud/pace/sdk/PACECloudSDK.kt
index 800ae0e5..76b27de1 100644
--- a/library/src/main/java/cloud/pace/sdk/PACECloudSDK.kt
+++ b/library/src/main/java/cloud/pace/sdk/PACECloudSDK.kt
@@ -13,6 +13,7 @@ object PACECloudSDK : CloudSDKKoinComponent {
 
     private val sharedPreferencesModel: SharedPreferencesModel by inject()
     internal lateinit var configuration: Configuration
+    var additionalQueryParams: Map<String, String> = mapOf()
 
     /**
      * Sets up [PACECloudSDK] with the passed [configuration].
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/DeduplicatePoiAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/DeduplicatePoiAPI.kt
index 596a3098..aa954cba 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/DeduplicatePoiAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/DeduplicatePoiAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface DeduplicatePoiService {
 
@@ -28,20 +29,9 @@ interface DeduplicatePoiService {
     ): Call<Void>
 }
 
-
 private val service: DeduplicatePoiService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/MovePoiAtPositionAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/MovePoiAtPositionAPI.kt
index 1672757c..4ff93477 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/MovePoiAtPositionAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/MovePoiAtPositionAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface MovePoiAtPositionService {
 
@@ -28,20 +29,9 @@ interface MovePoiAtPositionService {
     ): Call<Void>
 }
 
-
 private val service: MovePoiAtPositionService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CheckForPaceAppAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CheckForPaceAppAPI.kt
index 82d890e1..f92dc3af 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CheckForPaceAppAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CheckForPaceAppAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface CheckForPaceAppService {
 
@@ -38,22 +39,9 @@ Please note that calling this API is very cheap and can be done regularly.
     ): Call<LocationBasedAppsWithRefs>
 }
 
-
 private val service: CheckForPaceAppService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CreateAppAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CreateAppAPI.kt
index 163ada94..bcbd78d5 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CreateAppAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CreateAppAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface CreateAppService {
 
@@ -29,20 +30,9 @@ interface CreateAppService {
     ): Call<LocationBasedApp>
 }
 
-
 private val service: CreateAppService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/DeleteAppAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/DeleteAppAPI.kt
index 45d34f31..933fe3c7 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/DeleteAppAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/DeleteAppAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface DeleteAppService {
 
@@ -30,20 +31,9 @@ interface DeleteAppService {
     ): Call<Void>
 }
 
-
 private val service: DeleteAppService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppAPI.kt
index b4ae6b6a..7f0317ab 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetAppService {
 
@@ -32,22 +33,9 @@ In case the query returns a `404` (`Not Found`) the app was deleted and should b
     ): Call<LocationBasedApp>
 }
 
-
 private val service: GetAppService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppPOIsRelationshipsAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppPOIsRelationshipsAPI.kt
index 1fed5035..37e8e9f1 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppPOIsRelationshipsAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppPOIsRelationshipsAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetAppPOIsRelationshipsService {
 
@@ -30,22 +31,9 @@ interface GetAppPOIsRelationshipsService {
     ): Call<List<AppPOIsRelationships>>
 }
 
-
 private val service: GetAppPOIsRelationshipsService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppRedirectAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppRedirectAPI.kt
index 0b0c355d..5239ee9b 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppRedirectAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppRedirectAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetAppRedirectService {
 
@@ -29,20 +30,9 @@ interface GetAppRedirectService {
     ): Call<Void>
 }
 
-
 private val service: GetAppRedirectService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppsAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppsAPI.kt
index cfdcf4dd..12a1d76d 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppsAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppsAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetAppsService {
 
@@ -35,22 +36,9 @@ interface GetAppsService {
     ): Call<LocationBasedApps>
 }
 
-
 private val service: GetAppsService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppAPI.kt
index 19c689c1..748eb791 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface UpdateAppService {
 
@@ -30,22 +31,9 @@ interface UpdateAppService {
     ): Call<LocationBasedApp>
 }
 
-
 private val service: UpdateAppService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppPOIsRelationshipsAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppPOIsRelationshipsAPI.kt
index 360da362..af9418b1 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppPOIsRelationshipsAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppPOIsRelationshipsAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface UpdateAppPOIsRelationshipsService {
 
@@ -30,22 +31,9 @@ interface UpdateAppPOIsRelationshipsService {
     ): Call<List<AppPOIsRelationships>>
 }
 
-
 private val service: UpdateAppPOIsRelationshipsService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/dataDumps/GetDuplicatesKMLAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/dataDumps/GetDuplicatesKMLAPI.kt
index 93a6bacf..07ead1aa 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/dataDumps/GetDuplicatesKMLAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/dataDumps/GetDuplicatesKMLAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetDuplicatesKMLService {
 
@@ -30,22 +31,9 @@ interface GetDuplicatesKMLService {
     ): Call<Void>
 }
 
-
 private val service: GetDuplicatesKMLService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.google-earth.kml+xml")
-                .header("Content-Type", "application/vnd.google-earth.kml+xml")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.google-earth.kml+xml", "application/vnd.google-earth.kml+xml")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/dataDumps/GetPoisDumpAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/dataDumps/GetPoisDumpAPI.kt
index 41c074d6..d7d3d58b 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/dataDumps/GetPoisDumpAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/dataDumps/GetPoisDumpAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetPoisDumpService {
 
@@ -31,22 +32,9 @@ interface GetPoisDumpService {
     ): Call<Void>
 }
 
-
 private val service: GetPoisDumpService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
-                .header("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/delivery/DeleteGasStationReferenceStatusAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/delivery/DeleteGasStationReferenceStatusAPI.kt
index 1428a490..e60f9922 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/delivery/DeleteGasStationReferenceStatusAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/delivery/DeleteGasStationReferenceStatusAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface DeleteGasStationReferenceStatusService {
 
@@ -31,20 +32,9 @@ interface DeleteGasStationReferenceStatusService {
     ): Call<Void>
 }
 
-
 private val service: DeleteGasStationReferenceStatusService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/delivery/PutGasStationReferenceStatusAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/delivery/PutGasStationReferenceStatusAPI.kt
index 2cb615a5..3f2f956a 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/delivery/PutGasStationReferenceStatusAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/delivery/PutGasStationReferenceStatusAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface PutGasStationReferenceStatusService {
 
@@ -31,20 +32,9 @@ interface PutGasStationReferenceStatusService {
     ): Call<Void>
 }
 
-
 private val service: PutGasStationReferenceStatusService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/events/GetEventsAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/events/GetEventsAPI.kt
index 76c3a4ae..3b2e0384 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/events/GetEventsAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/events/GetEventsAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetEventsService {
 
@@ -33,22 +34,9 @@ interface GetEventsService {
     ): Call<Events>
 }
 
-
 private val service: GetEventsService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationAPI.kt
index 2660e285..cd07bb22 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetGasStationService {
 
@@ -32,22 +33,9 @@ interface GetGasStationService {
     ): Call<GasStation>
 }
 
-
 private val service: GetGasStationService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationFuelTypeNameMappingAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationFuelTypeNameMappingAPI.kt
index 8ba656d9..9a0e9553 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationFuelTypeNameMappingAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationFuelTypeNameMappingAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetGasStationFuelTypeNameMappingService {
 
@@ -32,22 +33,9 @@ interface GetGasStationFuelTypeNameMappingService {
     ): Call<FuelType>
 }
 
-
 private val service: GetGasStationFuelTypeNameMappingService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationsAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationsAPI.kt
index ab1f59b7..bc5476b2 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationsAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationsAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetGasStationsService {
 
@@ -46,22 +47,9 @@ To search inside a bounding box provide the following query parameter:
     ): Call<GasStations>
 }
 
-
 private val service: GetGasStationsService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/metadataFilters/GetMetadataFiltersAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/metadataFilters/GetMetadataFiltersAPI.kt
index 01a8b84b..cdb30aaf 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/metadataFilters/GetMetadataFiltersAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/metadataFilters/GetMetadataFiltersAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetMetadataFiltersService {
 
@@ -36,22 +37,9 @@ For the latitude and longitude values used in the request, returns the available
     ): Call<Categories>
 }
 
-
 private val service: GetMetadataFiltersService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/ChangePoiAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/ChangePoiAPI.kt
index e3556d43..1a668220 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/ChangePoiAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/ChangePoiAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface ChangePoiService {
 
@@ -30,22 +31,9 @@ interface ChangePoiService {
     ): Call<POI>
 }
 
-
 private val service: ChangePoiService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/GetPoiAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/GetPoiAPI.kt
index 37e8c1e5..2c82eedd 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/GetPoiAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/GetPoiAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetPoiService {
 
@@ -30,22 +31,9 @@ interface GetPoiService {
     ): Call<POI>
 }
 
-
 private val service: GetPoiService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/GetPoisAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/GetPoisAPI.kt
index b54f8a84..8270746f 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/GetPoisAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/GetPoisAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetPoisService {
 
@@ -33,22 +34,9 @@ interface GetPoisService {
     ): Call<POIs>
 }
 
-
 private val service: GetPoisService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/CreatePolicyAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/CreatePolicyAPI.kt
index 82694099..80d7bfee 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/CreatePolicyAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/CreatePolicyAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface CreatePolicyService {
 
@@ -29,20 +30,9 @@ interface CreatePolicyService {
     ): Call<Policy>
 }
 
-
 private val service: CreatePolicyService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/GetPoliciesAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/GetPoliciesAPI.kt
index dcb46838..eaeeb3fd 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/GetPoliciesAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/GetPoliciesAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetPoliciesService {
 
@@ -34,22 +35,9 @@ interface GetPoliciesService {
     ): Call<Policies>
 }
 
-
 private val service: GetPoliciesService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/GetPolicyAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/GetPolicyAPI.kt
index f19f598a..c3c0371e 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/GetPolicyAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/GetPolicyAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetPolicyService {
 
@@ -30,22 +31,9 @@ interface GetPolicyService {
     ): Call<Policy>
 }
 
-
 private val service: GetPolicyService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/priceHistories/GetPriceHistoryAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/priceHistories/GetPriceHistoryAPI.kt
index 1177e15e..d28d525d 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/priceHistories/GetPriceHistoryAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/priceHistories/GetPriceHistoryAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetPriceHistoryService {
 
@@ -35,22 +36,9 @@ interface GetPriceHistoryService {
     ): Call<PriceHistory>
 }
 
-
 private val service: GetPriceHistoryService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/prices/GetRegionalPricesAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/prices/GetRegionalPricesAPI.kt
index 34bddea9..0a62301c 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/prices/GetRegionalPricesAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/prices/GetRegionalPricesAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetRegionalPricesService {
 
@@ -32,22 +33,9 @@ interface GetRegionalPricesService {
     ): Call<List<RegionalPrices>>
 }
 
-
 private val service: GetRegionalPricesService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/CreateSourceAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/CreateSourceAPI.kt
index a116487f..4f1038bf 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/CreateSourceAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/CreateSourceAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface CreateSourceService {
 
@@ -29,20 +30,9 @@ interface CreateSourceService {
     ): Call<Source>
 }
 
-
 private val service: CreateSourceService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/DeleteSourceAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/DeleteSourceAPI.kt
index b5d74dd7..102fd35e 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/DeleteSourceAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/DeleteSourceAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface DeleteSourceService {
 
@@ -30,20 +31,9 @@ interface DeleteSourceService {
     ): Call<Void>
 }
 
-
 private val service: DeleteSourceService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/GetSourceAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/GetSourceAPI.kt
index 1ed53a16..1cbe981a 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/GetSourceAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/GetSourceAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetSourceService {
 
@@ -30,22 +31,9 @@ interface GetSourceService {
     ): Call<Source>
 }
 
-
 private val service: GetSourceService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/GetSourcesAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/GetSourcesAPI.kt
index 7de52146..d087cffb 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/GetSourcesAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/GetSourcesAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetSourcesService {
 
@@ -33,22 +34,9 @@ interface GetSourcesService {
     ): Call<Sources>
 }
 
-
 private val service: GetSourcesService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/UpdateSourceAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/UpdateSourceAPI.kt
index 861578c2..2ef0726f 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/UpdateSourceAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/UpdateSourceAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface UpdateSourceService {
 
@@ -30,22 +31,9 @@ interface UpdateSourceService {
     ): Call<Source>
 }
 
-
 private val service: UpdateSourceService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/DeleteSubscriptionAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/DeleteSubscriptionAPI.kt
index c5c82887..0ec91bf8 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/DeleteSubscriptionAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/DeleteSubscriptionAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface DeleteSubscriptionService {
 
@@ -28,20 +29,9 @@ interface DeleteSubscriptionService {
     ): Call<Void>
 }
 
-
 private val service: DeleteSubscriptionService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/GetSubscriptionsAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/GetSubscriptionsAPI.kt
index 5c57e069..1bc56365 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/GetSubscriptionsAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/GetSubscriptionsAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetSubscriptionsService {
 
@@ -30,22 +31,9 @@ interface GetSubscriptionsService {
     ): Call<Subscription>
 }
 
-
 private val service: GetSubscriptionsService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/StoreSubscriptionAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/StoreSubscriptionAPI.kt
index 665e11b2..f289fcb8 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/StoreSubscriptionAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/StoreSubscriptionAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface StoreSubscriptionService {
 
@@ -43,22 +44,9 @@ interface StoreSubscriptionService {
     ): Call<Subscription>
 }
 
-
 private val service: StoreSubscriptionService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/tiles/GetTilesAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/tiles/GetTilesAPI.kt
index d95a54b6..17648d2b 100644
--- a/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/tiles/GetTilesAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/tiles/GetTilesAPI.kt
@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetTilesService {
 
@@ -30,22 +31,9 @@ interface GetTilesService {
     ): Call<Void>
 }
 
-
 private val service: GetTilesService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/protobuf")
-                .header("Content-Type", "application/protobuf")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/protobuf", "application/protobuf")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(
diff --git a/library/src/main/java/cloud/pace/sdk/idkit/OIDConfiguration.kt b/library/src/main/java/cloud/pace/sdk/idkit/OIDConfiguration.kt
index 064355f9..d0c2f3da 100644
--- a/library/src/main/java/cloud/pace/sdk/idkit/OIDConfiguration.kt
+++ b/library/src/main/java/cloud/pace/sdk/idkit/OIDConfiguration.kt
@@ -11,5 +11,5 @@ data class OIDConfiguration @JvmOverloads constructor(
     val scopes: List<String>? = null,
     val redirectUri: String,
     val responseType: String = ResponseTypeValues.CODE,
-    val additionalParameters: Map<String, String>? = null
+    var additionalParameters: Map<String, String>? = null
 )
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/utils/InterceptorUtils.kt b/library/src/main/java/cloud/pace/sdk/poikit/utils/InterceptorUtils.kt
new file mode 100644
index 00000000..f3b2608a
--- /dev/null
+++ b/library/src/main/java/cloud/pace/sdk/poikit/utils/InterceptorUtils.kt
@@ -0,0 +1,32 @@
+package cloud.pace.sdk.poikit.utils
+
+import cloud.pace.sdk.PACECloudSDK
+import cloud.pace.sdk.api.API
+import okhttp3.Interceptor
+
+object InterceptorUtils {
+
+    fun getInterceptor(accept: String?, contentType: String?): Interceptor {
+        return Interceptor {
+            val httpUrl = it.request().url().newBuilder()
+            httpUrl.addQueryParameter("utm_partner_client", PACECloudSDK.configuration.clientAppName)
+            PACECloudSDK.additionalQueryParams.forEach {
+                httpUrl.addQueryParameter(it.key, it.value)
+            }
+
+            val builder = it.request()
+                .newBuilder()
+                .url(httpUrl.build())
+                .header("API-Key", API.apiKey)
+
+            if (accept != null) builder.header("Accept", accept)
+            if (contentType != null) builder.header("Content-Type", contentType)
+
+            API.additionalHeaders.forEach { header ->
+                builder.header(header.key, header.value)
+            }
+
+            it.proceed(builder.build())
+        }
+    }
+}