diff --git a/README.md b/README.md
index 6ea94b8..4118f2e 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Add the following to your `build.gradle`:
 
 ```groovy
 dependencies {
-    implementation("com.jedlix:sdk:1.2.0")
+    implementation("com.jedlix:sdk:1.4.0")
 }
 ```
 
diff --git a/example/build.gradle.kts b/example/build.gradle.kts
index f3d7aea..b60fa5f 100644
--- a/example/build.gradle.kts
+++ b/example/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("com.android.application")
     kotlin("android")
+    kotlin("kapt")
     id("com.github.triplet.play") version "3.7.0"
 }
 
@@ -46,6 +47,7 @@ android {
     }
 
     dataBinding {
+        isEnabled = true
         addKtx = true
     }
 
diff --git a/example/src/main/java/com/jedlix/sdk/example/activity/ConnectionsActivity.kt b/example/src/main/java/com/jedlix/sdk/example/activity/ConnectionsActivity.kt
index bf7c850..1c9c317 100644
--- a/example/src/main/java/com/jedlix/sdk/example/activity/ConnectionsActivity.kt
+++ b/example/src/main/java/com/jedlix/sdk/example/activity/ConnectionsActivity.kt
@@ -23,6 +23,9 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.jedlix.sdk.connectSession.registerConnectSessionManager
+import com.jedlix.sdk.example.adapter.ButtonListAdapter
+import com.jedlix.sdk.example.adapter.ConnectSessionViewModelAdapter
+import com.jedlix.sdk.example.adapter.GroupedConnectSessionViewModelAdapter
 import com.jedlix.sdk.example.databinding.ActivityConnectionsBinding
 import com.jedlix.sdk.example.viewModel.ConnectionsViewModel
 import kotlinx.coroutines.flow.collect
@@ -47,6 +50,9 @@ class ConnectionsActivity : AppCompatActivity() {
         binding.viewModel = viewModel
         binding.lifecycleOwner = this
 
+        binding.vehicles.adapter = ConnectSessionViewModelAdapter(this)
+        binding.chargers.adapter = GroupedConnectSessionViewModelAdapter(this)
+
         val connectSessionManager = registerConnectSessionManager {
             viewModel.reloadData()
         }
diff --git a/example/src/main/java/com/jedlix/sdk/example/adapter/ButtonListAdapter.kt b/example/src/main/java/com/jedlix/sdk/example/adapter/ButtonListAdapter.kt
new file mode 100644
index 0000000..49062fd
--- /dev/null
+++ b/example/src/main/java/com/jedlix/sdk/example/adapter/ButtonListAdapter.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2022 Jedlix B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.jedlix.sdk.example.adapter
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.jedlix.sdk.example.databinding.ViewButtonRowBinding
+import com.jedlix.sdk.example.model.Button
+
+class ButtonListAdapter : RecyclerView.Adapter<ButtonListAdapter.ButtonViewHolder>() {
+
+    companion object {
+        @BindingAdapter("modelButtons")
+        @JvmStatic
+        fun bindModelButtons(recyclerView: RecyclerView, buttons: List<Button>?) {
+            (recyclerView.adapter as? ButtonListAdapter)?.buttons = buttons ?: emptyList()
+        }
+    }
+
+    class ButtonViewHolder(val binding: ViewButtonRowBinding) : RecyclerView.ViewHolder(binding.root)
+
+    private var buttons: List<Button> = emptyList()
+        @SuppressLint("NotifyDataSetChanged")
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+
+    override fun getItemCount(): Int = buttons.size
+
+    override fun onBindViewHolder(holder: ButtonViewHolder, position: Int) {
+        holder.binding.button.apply {
+            val modelButton = buttons.getOrNull(position)
+            text = modelButton?.title
+            setOnClickListener { modelButton?.action?.invoke() }
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ButtonViewHolder(
+        ViewButtonRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+}
diff --git a/example/src/main/java/com/jedlix/sdk/example/adapter/ConnectSessionViewModelAdapter.kt b/example/src/main/java/com/jedlix/sdk/example/adapter/ConnectSessionViewModelAdapter.kt
new file mode 100644
index 0000000..bff3f44
--- /dev/null
+++ b/example/src/main/java/com/jedlix/sdk/example/adapter/ConnectSessionViewModelAdapter.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2022 Jedlix B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.jedlix.sdk.example.adapter
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.RecyclerView
+import com.jedlix.sdk.example.databinding.ViewConnectSessionViewModelRowBinding
+import com.jedlix.sdk.example.viewModel.ConnectSessionViewModel
+
+class ConnectSessionViewModelAdapter(val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<ConnectSessionViewModelAdapter.ViewHolder>() {
+
+    companion object {
+        @BindingAdapter("connectSessionViewModels")
+        @JvmStatic
+        fun bindModelButtons(recyclerView: RecyclerView, connectSessionViewModels: List<ConnectSessionViewModel>?) {
+            (recyclerView.adapter as? ConnectSessionViewModelAdapter)?.connectSessionViewModels = connectSessionViewModels ?: emptyList()
+        }
+    }
+
+    class ViewHolder(val binding: ViewConnectSessionViewModelRowBinding) : RecyclerView.ViewHolder(binding.root)
+
+    private var connectSessionViewModels: List<ConnectSessionViewModel> = emptyList()
+    @SuppressLint("NotifyDataSetChanged")
+    set(value) {
+        field = value
+        notifyDataSetChanged()
+    }
+
+    override fun getItemCount(): Int = connectSessionViewModels.size
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.binding.apply {
+            viewModel = connectSessionViewModels[position]
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
+        ViewConnectSessionViewModelRowBinding.inflate(LayoutInflater.from(parent.context), parent, false).apply {
+            lifecycleOwner = this@ConnectSessionViewModelAdapter.lifecycleOwner
+            buttons.adapter = ButtonListAdapter()
+        }
+    )
+}
\ No newline at end of file
diff --git a/example/src/main/java/com/jedlix/sdk/example/adapter/GroupedConnectSessionViewModelAdapter.kt b/example/src/main/java/com/jedlix/sdk/example/adapter/GroupedConnectSessionViewModelAdapter.kt
new file mode 100644
index 0000000..a6e17f0
--- /dev/null
+++ b/example/src/main/java/com/jedlix/sdk/example/adapter/GroupedConnectSessionViewModelAdapter.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2022 Jedlix B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.jedlix.sdk.example.adapter
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.RecyclerView
+import com.jedlix.sdk.example.databinding.ViewConnectSessionViewModelRowBinding
+import com.jedlix.sdk.example.databinding.ViewGroupedConnectSessionViewModelRowBinding
+import com.jedlix.sdk.example.viewModel.GroupedConnectSessionViewModel
+
+class GroupedConnectSessionViewModelAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<GroupedConnectSessionViewModelAdapter.ViewHolder>() {
+
+    companion object {
+        @BindingAdapter("groupedConnectSessionViewModels")
+        @JvmStatic
+        fun bindModelButtons(recyclerView: RecyclerView, connectSessionViewModels: List<GroupedConnectSessionViewModel>?) {
+            (recyclerView.adapter as? GroupedConnectSessionViewModelAdapter)?.groupedConnectSessionViewModels = connectSessionViewModels ?: emptyList()
+        }
+    }
+
+    class ViewHolder(val binding: ViewGroupedConnectSessionViewModelRowBinding) : RecyclerView.ViewHolder(binding.root)
+
+    private var groupedConnectSessionViewModels: List<GroupedConnectSessionViewModel> = emptyList()
+    @SuppressLint("NotifyDataSetChanged")
+    set(value) {
+        field = value
+        notifyDataSetChanged()
+    }
+
+    override fun getItemCount(): Int = groupedConnectSessionViewModels.size
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.binding.apply {
+            viewModel = groupedConnectSessionViewModels[position]
+
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
+        ViewGroupedConnectSessionViewModelRowBinding.inflate(LayoutInflater.from(parent.context), parent, false).apply {
+            lifecycleOwner = this@GroupedConnectSessionViewModelAdapter.lifecycleOwner
+            connectSessions.adapter = ConnectSessionViewModelAdapter(this@GroupedConnectSessionViewModelAdapter.lifecycleOwner)
+        }
+    )
+}
\ No newline at end of file
diff --git a/sdk/src/main/java/com/jedlix/sdk/model/ChargingLocationTariff.kt b/example/src/main/java/com/jedlix/sdk/example/model/Button.kt
similarity index 86%
rename from sdk/src/main/java/com/jedlix/sdk/model/ChargingLocationTariff.kt
rename to example/src/main/java/com/jedlix/sdk/example/model/Button.kt
index 7037001..b3cc6e6 100644
--- a/sdk/src/main/java/com/jedlix/sdk/model/ChargingLocationTariff.kt
+++ b/example/src/main/java/com/jedlix/sdk/example/model/Button.kt
@@ -14,7 +14,6 @@
  *     limitations under the License.
  */
 
-package com.jedlix.sdk.model
-
-import kotlinx.serialization.Serializable
+package com.jedlix.sdk.example.model
 
+data class Button(val title: String, val action: () -> Unit)
diff --git a/example/src/main/java/com/jedlix/sdk/example/viewModel/ChargerViewModel.kt b/example/src/main/java/com/jedlix/sdk/example/viewModel/ChargerViewModel.kt
new file mode 100644
index 0000000..3aff1de
--- /dev/null
+++ b/example/src/main/java/com/jedlix/sdk/example/viewModel/ChargerViewModel.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2022 Jedlix B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.jedlix.sdk.example.viewModel
+
+import com.jedlix.sdk.example.model.Button
+import com.jedlix.sdk.model.Charger
+import com.jedlix.sdk.model.ChargerConnectSession
+
+class ChargerViewModel(
+    charger: Charger,
+    connectSession: ChargerConnectSession?,
+    private val resumeConnectSession: (ChargerConnectSession) -> Unit,
+    private val removeCharger: (Charger) -> Unit
+) : ConnectSessionViewModel {
+
+    override val title = charger.detail.fullName
+    override val buttons = listOfNotNull(
+        connectSession?.let { Button("Resume") { resumeConnectSession(it) } },
+        Button("Remove") { removeCharger(charger) }
+    )
+
+    private val Charger.Detail.fullName: String get() = listOfNotNull(brand, model).joinToString(" ")
+}
diff --git a/example/src/main/java/com/jedlix/sdk/example/viewModel/ChargingLocationViewModel.kt b/example/src/main/java/com/jedlix/sdk/example/viewModel/ChargingLocationViewModel.kt
new file mode 100644
index 0000000..8561561
--- /dev/null
+++ b/example/src/main/java/com/jedlix/sdk/example/viewModel/ChargingLocationViewModel.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2022 Jedlix B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.jedlix.sdk.example.viewModel
+
+import com.jedlix.sdk.example.model.Button
+import com.jedlix.sdk.model.Charger
+import com.jedlix.sdk.model.ChargerConnectSession
+import com.jedlix.sdk.model.ChargingLocation
+
+class ChargingLocationViewModel(
+    private val chargingLocation: ChargingLocation,
+    chargers: List<Charger>,
+    private val chargerSessions: List<ChargerConnectSession>,
+    private val startChargerConnectSession: (ChargingLocation) -> Unit,
+    private val resumeConnectSession: (ChargerConnectSession) -> Unit,
+    private val removeCharger: (Charger) -> Unit
+) : GroupedConnectSessionViewModel {
+
+    override val title = chargingLocation.address.let { listOfNotNull(it.street, it.houseNumber, it.city).joinToString(", ") }
+    override val connectSessionViewModels = chargers.map { charger ->
+        ChargerViewModel(charger, chargerSessions.firstOrNull { it.chargerId == charger.id }, resumeConnectSession, removeCharger)
+    }.ifEmpty {
+        val connectSessionWithoutVehicle = chargerSessions.firstOrNull { it.chargingLocationId == chargingLocation.id && it.chargerId.isNullOrEmpty() }
+        listOf(
+            object : ConnectSessionViewModel {
+                override val title: String = if (connectSessionWithoutVehicle != null) "Unfinished connect session" else "No Chargers found"
+                override val buttons: List<Button> = listOf(
+                    connectSessionWithoutVehicle?.let { Button("Resume") { resumeConnectSession(it) } } ?: Button("Connect") { startChargerConnectSession(chargingLocation) }
+                )
+            }
+        )
+    }
+}
diff --git a/example/src/main/java/com/jedlix/sdk/example/viewModel/ConnectSessionViewModel.kt b/example/src/main/java/com/jedlix/sdk/example/viewModel/ConnectSessionViewModel.kt
new file mode 100644
index 0000000..b7325b9
--- /dev/null
+++ b/example/src/main/java/com/jedlix/sdk/example/viewModel/ConnectSessionViewModel.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022 Jedlix B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.jedlix.sdk.example.viewModel
+
+import com.jedlix.sdk.example.model.Button
+
+interface ConnectSessionViewModel {
+    val title: String
+    val buttons: List<Button>
+}
+
+interface GroupedConnectSessionViewModel {
+    val title: String
+    val connectSessionViewModels: List<ConnectSessionViewModel>
+}
diff --git a/example/src/main/java/com/jedlix/sdk/example/viewModel/ConnectionsViewModel.kt b/example/src/main/java/com/jedlix/sdk/example/viewModel/ConnectionsViewModel.kt
index 6f5f457..df7b5c1 100644
--- a/example/src/main/java/com/jedlix/sdk/example/viewModel/ConnectionsViewModel.kt
+++ b/example/src/main/java/com/jedlix/sdk/example/viewModel/ConnectionsViewModel.kt
@@ -22,10 +22,12 @@ import androidx.lifecycle.viewModelScope
 import com.jedlix.sdk.JedlixSDK
 import com.jedlix.sdk.connectSession.ConnectSessionType
 import com.jedlix.sdk.example.ExampleApplication
+import com.jedlix.sdk.example.model.Button
 import com.jedlix.sdk.model.*
 import com.jedlix.sdk.networking.Api
 import com.jedlix.sdk.networking.Error
 import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 
@@ -47,54 +49,48 @@ class ConnectionsViewModel(private val userIdentifier: String) : ViewModel() {
     private val _errorMessage = MutableStateFlow<String?>(null)
     val errorMessage: StateFlow<String?> = _errorMessage
 
-    private val vehicle = MutableStateFlow<Vehicle?>(null)
+    private val vehicles = MutableStateFlow<List<Vehicle>>(emptyList())
     private val vehicleSessions = MutableStateFlow<List<VehicleConnectSession>>(emptyList())
-    val vehicleText = vehicle.combine(vehicleSessions) { vehicle, vehicleSessions ->
-        if (vehicleSessions.count() > 0) {
-            "Unfinished connect session"
-        } else {
-            vehicle?.details?.let { "${it.brand} ${it.model}" } ?: "No vehicles found"
-        }
-    }.stateIn(viewModelScope, SharingStarted.Lazily, "")
-    val vehicleButtonText = vehicle.combine(vehicleSessions) { vehicle, vehicleSessions ->
-        if (vehicleSessions.count() > 0) {
-            "Resume"
-        } else {
-            if (vehicle != null) {
-                "Remove"
-            } else {
-                "Connect"
-            }
+    val vehicleConnectSessionViewModels = combine(vehicles, vehicleSessions) { vehicles, vehicleSessions ->
+        vehicles.map { vehicle ->
+            VehicleViewModel(vehicle, vehicleSessions.firstOrNull { it.vehicleId == vehicle.id  }, this::resumeConnectSession, this::removeVehicle)
+        }.ifEmpty {
+            val connectSessionWithoutVehicle = vehicleSessions.firstOrNull { it.vehicleId.isNullOrEmpty() }
+            listOf(
+                object : ConnectSessionViewModel {
+                    override val title: String = if (connectSessionWithoutVehicle != null) "Unfinished connect session" else "No vehicles found"
+                    override val buttons: List<Button> = listOf(
+                        connectSessionWithoutVehicle?.let { Button("Resume") { resumeConnectSession(it) } } ?: Button("Connect") { startVehicleConnectSession() }
+                    )
+                }
+            )
         }
-    }.stateIn(viewModelScope, SharingStarted.Lazily, "")
+    }.stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
 
     private val chargingLocations = MutableStateFlow(emptyList<ChargingLocation>())
-    val chargingLocationText = chargingLocations.map { locations ->
-        locations.firstOrNull()?.let {
-            listOfNotNull(it.address.street, it.address.houseNumber, it.address.city).joinToString(", ")
-        } ?: "No charging locations found"
-    }.stateIn(viewModelScope, SharingStarted.Lazily, "")
-
-    private val charger = MutableStateFlow<Charger?>(null)
+    private val chargers = MutableStateFlow<List<Charger>>(emptyList())
     private val chargerSessions = MutableStateFlow<List<ChargerConnectSession>>(emptyList())
-    val chargerText = charger.combine(chargerSessions) { charger, chargerSessions ->
-        if (chargerSessions.count() > 0) {
-            "Unfinished connect session"
-        } else {
-            charger?.detail?.let { "${it.brand} ${it.model}" } ?: "No chargers found"
-        }
-    }.stateIn(viewModelScope, SharingStarted.Lazily, "")
-    val chargerButtonText = charger.combine(chargerSessions) { charger, chargerSessions ->
-        if (chargerSessions.count() > 0) {
-            "Resume"
-        } else {
-            if (charger != null) {
-                "Remove"
-            } else {
-                "Connect"
-            }
+    val chargerConnectSessionViewModels = combine(chargers, chargerSessions, chargingLocations) { chargers, chargerSessions, chargingLocations ->
+        val chargersPerLocation = chargers.groupBy { it.chargingLocationId }
+        val sessionsPerLocation = chargerSessions.groupBy { it.chargingLocationId }
+        chargingLocations.map { chargingLocation ->
+            ChargingLocationViewModel(
+                chargingLocation,
+                chargersPerLocation[chargingLocation.id] ?: emptyList(),
+                sessionsPerLocation[chargingLocation.id] ?: emptyList(),
+                this::startChargerConnectSession,
+                this::resumeConnectSession,
+                this::removeCharger
+            )
+        }.ifEmpty {
+            listOf(
+                object : GroupedConnectSessionViewModel {
+                    override val title: String = "No charging locations found"
+                    override val connectSessionViewModels: List<ConnectSessionViewModel> = emptyList()
+                }
+            )
         }
-    }.stateIn(viewModelScope, SharingStarted.Lazily, "")
+    }.stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
 
     private val _didDeauthenticate = MutableSharedFlow<Unit>()
     val didDeauthenticate: SharedFlow<Unit> = _didDeauthenticate
@@ -107,32 +103,6 @@ class ConnectionsViewModel(private val userIdentifier: String) : ViewModel() {
         reloadData()
     }
 
-    fun vehicleButtonPressed() {
-        vehicleSessions.value.firstOrNull()?.let {
-            resumeConnectSession(it.id)
-        } ?: run {
-            if (vehicle.value != null) {
-                removeVehicle()
-            } else {
-                startVehicleConnectSession()
-            }
-        }
-    }
-
-    fun chargerButtonPressed() {
-        chargerSessions.value.firstOrNull()?.let {
-            resumeConnectSession(it.id)
-        } ?: run {
-            if (charger.value != null) {
-                removeCharger()
-            } else {
-                chargingLocations.value.firstOrNull()?.let {
-                    startChargerConnectSession(it)
-                }
-            }
-        }
-    }
-
     fun deauthenticate() {
         ExampleApplication.authentication.deauthenticate()
         viewModelScope.launch {
@@ -145,10 +115,10 @@ class ConnectionsViewModel(private val userIdentifier: String) : ViewModel() {
             val vehicleResponse = viewModelScope.async {
                 when (val response = JedlixSDK.api.request { Users().User(userIdentifier).Vehicles().Get() }) {
                     is Api.Response.Success -> {
-                        vehicle.value = response.result.firstOrNull()
-                        _errorMessage.value = null
+                        vehicles.value = response.result
+                        null
                     }
-                    is Api.Response.Failure -> response.showMessage()
+                    is Api.Response.Failure -> response.message
                 }
             }
 
@@ -156,32 +126,31 @@ class ConnectionsViewModel(private val userIdentifier: String) : ViewModel() {
                 when (val response = JedlixSDK.api.request { Users().User(userIdentifier).ChargingLocations().Get() }) {
                     is Api.Response.Success -> {
                         chargingLocations.value = response.result
-                        _errorMessage.value = null
+                        null
                     }
-                    is Api.Response.Failure -> response.showMessage()
+                    is Api.Response.Failure -> response.message
                 }
             }
 
             val chargersResponse = viewModelScope.async {
-                    when (val response = JedlixSDK.api.request { Users().User(userIdentifier).Chargers().Get() }) {
-                        is Api.Response.Success -> {
-                            _errorMessage.value = null
-                            response.result.firstOrNull()
-                        }
-                        is Api.Response.Failure -> {
-                            response.showMessage()
-                            null
-                        }
+                when (val response = JedlixSDK.api.request { Users().User(userIdentifier).Chargers().Get() }) {
+                    is Api.Response.Success -> {
+                        chargers.value = response.result
+                        null
+                    }
+                    is Api.Response.Failure -> {
+                        response.message
                     }
+                }
             }
 
             val vehicleSessionsResponse = viewModelScope.async {
                 when (val response = JedlixSDK.api.request { Users().User(userIdentifier).ConnectSessions().GetVehicleConnectSessions() }) {
                     is Api.Response.Success -> {
                         vehicleSessions.value = response.result
-                        _errorMessage.value = null
+                        null
                     }
-                    is Api.Response.Failure -> response.showMessage()
+                    is Api.Response.Failure -> response.message
                 }
             }
 
@@ -189,37 +158,32 @@ class ConnectionsViewModel(private val userIdentifier: String) : ViewModel() {
                 when (val response = JedlixSDK.api.request { Users().User(userIdentifier).ConnectSessions().GetChargerConnectSessions() }) {
                     is Api.Response.Success -> {
                         chargerSessions.value = response.result
-                        _errorMessage.value = null
+                        null
                     }
-                    is Api.Response.Failure -> response.showMessage()
+                    is Api.Response.Failure -> response.message
                 }
             }
 
-            vehicleResponse.await()
-            chargingLocationsResponse.await()
-            chargersResponse.await()
-            vehicleSessionsResponse.await()
-            chargerSessionsResponse.await()
+            val messages = listOf(vehicleResponse, chargingLocationsResponse, chargersResponse, vehicleSessionsResponse, chargerSessionsResponse).awaitAll()
+            _errorMessage.value = messages.filterNotNull().joinToString(", ")
         }
     }
 
-    private fun removeVehicle() {
+    private fun removeVehicle(vehicle: Vehicle) {
         showLoaderDuring {
-            val vehicleId = vehicle.value?.id ?: return@showLoaderDuring
             when (
                 val response = JedlixSDK.api.request {
-                    Users().User(userIdentifier).Vehicles().Vehicle(vehicleId).Delete()
+                    Users().User(userIdentifier).Vehicles().Vehicle(vehicle.id).Delete()
                 }
             ) {
-                is Api.Response.Success -> vehicle.value = null
-                is Api.Response.Failure -> response.showMessage()
+                is Api.Response.Success -> vehicles.value = vehicles.value.toMutableList().apply { removeAll { it.id == vehicle.id } }
+                is Api.Response.Failure -> _errorMessage.value = response.message
             }
         }
     }
 
-    private fun removeCharger() {
+    private fun removeCharger(charger: Charger) {
         showLoaderDuring {
-            val charger = charger.value ?: return@showLoaderDuring
             val chargerId = charger.id
             val chargingLocationId = charger.chargingLocationId
             when (
@@ -227,8 +191,8 @@ class ConnectionsViewModel(private val userIdentifier: String) : ViewModel() {
                     Users().User(userIdentifier).ChargingLocations().ChargingLocation(chargingLocationId).Chargers().Charger(chargerId).Delete()
                 }
             ) {
-                is Api.Response.Success -> this.charger.value = null
-                is Api.Response.Failure -> response.showMessage()
+                is Api.Response.Success -> chargers.value = chargers.value.toMutableList().apply { removeAll { it.id == chargerId } }
+                is Api.Response.Failure -> _errorMessage.value = response.message
             }
         }
     }
@@ -245,9 +209,9 @@ class ConnectionsViewModel(private val userIdentifier: String) : ViewModel() {
         }
     }
 
-    private fun resumeConnectSession(sessionIdentifier: String) {
+    private fun resumeConnectSession(connectSession: ConnectSessionDescriptor) {
         viewModelScope.launch {
-            _didResumeConnectSession.emit(userIdentifier to sessionIdentifier)
+            _didResumeConnectSession.emit(userIdentifier to connectSession.id)
         }
     }
 
@@ -263,18 +227,16 @@ class ConnectionsViewModel(private val userIdentifier: String) : ViewModel() {
         }
     }
 
-    private fun Api.Response.Failure<*>.showMessage() {
-        _errorMessage.value = when (this) {
-            is Api.Response.Error -> {
-                when (error) {
-                    is Error.Forbidden -> "Forbidden"
-                    is Error.Unauthorized -> "Unauthorized"
-                    is Error.ApiError -> (error as Error.ApiError).title
-                }
+    private val Api.Response.Failure<*>.message: String? get() = when (this) {
+        is Api.Response.Error -> {
+            when (error) {
+                is Error.Forbidden -> "Forbidden"
+                is Error.Unauthorized -> "Unauthorized"
+                is Error.ApiError -> (error as Error.ApiError).title
             }
-            is Api.Response.NetworkFailure -> "Please check your network"
-            is Api.Response.InvalidResult -> "Unexpected response"
-            is Api.Response.SDKNotInitialized -> "SDK Not initialized properly"
         }
+        is Api.Response.NetworkFailure -> "Please check your network"
+        is Api.Response.InvalidResult -> "Unexpected response"
+        is Api.Response.SDKNotInitialized -> "SDK Not initialized properly"
     }
 }
diff --git a/example/src/main/java/com/jedlix/sdk/example/viewModel/VehicleViewModel.kt b/example/src/main/java/com/jedlix/sdk/example/viewModel/VehicleViewModel.kt
new file mode 100644
index 0000000..25128f0
--- /dev/null
+++ b/example/src/main/java/com/jedlix/sdk/example/viewModel/VehicleViewModel.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2022 Jedlix B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.jedlix.sdk.example.viewModel
+
+import com.jedlix.sdk.example.model.Button
+import com.jedlix.sdk.model.Vehicle
+import com.jedlix.sdk.model.VehicleConnectSession
+
+class VehicleViewModel(
+    vehicle: Vehicle,
+    connectSession: VehicleConnectSession?,
+    private val resumeConnectSession: (VehicleConnectSession) -> Unit,
+    private val removeVehicle: (Vehicle) -> Unit
+) : ConnectSessionViewModel {
+
+    override val title = vehicle.details.fullName
+    override val buttons = listOfNotNull(
+        connectSession?.let { Button("Resume") { resumeConnectSession(it) } },
+        Button("Remove") { removeVehicle(vehicle) }
+    )
+
+    private val Vehicle.Details.fullName: String get() = listOfNotNull(brand, model, version).joinToString(" ")
+}
diff --git a/example/src/main/res/layout/activity_connections.xml b/example/src/main/res/layout/activity_connections.xml
index 261c372..ca12827 100644
--- a/example/src/main/res/layout/activity_connections.xml
+++ b/example/src/main/res/layout/activity_connections.xml
@@ -19,11 +19,10 @@
         android:padding="10dp"
         tools:context=".activity.ConnectionsActivity">
 
-        <LinearLayout
+        <androidx.core.widget.NestedScrollView
             android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
             android:visibility="@{viewModel.isLoading ? View.GONE : View.VISIBLE}">
 
             <LinearLayout
@@ -31,72 +30,67 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <TextView
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="Vehicles"
-                    android:textStyle="bold" />
-
-                <TextView
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Vehicles"
+                        android:textStyle="bold" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/vehicles"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        app:connectSessionViewModels="@{viewModel.vehicleConnectSessionViewModels}"
+                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                        tools:itemCount="1"
+                        tools:listitem="@layout/view_button_row"/>
+
+                </LinearLayout>
+
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
-                    android:text="@{viewModel.vehicleText}" />
-
-                <androidx.appcompat.widget.AppCompatButton
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:onClick="@{view -> viewModel.vehicleButtonPressed()}"
-                    android:text="@{viewModel.vehicleButtonText}" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="Chargers"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:text="@{viewModel.chargingLocationText}" />
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Chargers"
+                        android:textStyle="bold" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/chargers"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        app:groupedConnectSessionViewModels="@{viewModel.chargerConnectSessionViewModels}"
+                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                        tools:itemCount="1"
+                        tools:listitem="@layout/view_grouped_connect_session_view_model_row"/>
+                </LinearLayout>
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
-                    android:text="@{viewModel.chargerText}" />
+                    android:text="@{viewModel.errorMessage}"
+                    android:visibility="@{viewModel.errorMessage.length() > 0 ? View.VISIBLE : View.GONE}" />
 
                 <androidx.appcompat.widget.AppCompatButton
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
-                    android:onClick="@{view -> viewModel.chargerButtonPressed()}"
-                    android:text="@{viewModel.chargerButtonText}" />
+                    android:onClick="@{view -> viewModel.deauthenticate()}"
+                    android:text="Deauthenticate" />
             </LinearLayout>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:text="@{viewModel.errorMessage}"
-                android:visibility="@{viewModel.errorMessage.length() > 0 ? View.VISIBLE : View.GONE}" />
-
-            <androidx.appcompat.widget.AppCompatButton
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:onClick="@{view -> viewModel.deauthenticate()}"
-                android:text="Deauthenticate" />
-        </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
 
         <ProgressBar
             android:layout_width="wrap_content"
diff --git a/example/src/main/res/layout/view_button_row.xml b/example/src/main/res/layout/view_button_row.xml
new file mode 100644
index 0000000..28422f5
--- /dev/null
+++ b/example/src/main/res/layout/view_button_row.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2022 Jedlix B.V. The Netherlands
+  ~
+  ~     Licensed under the Apache License, Version 2.0 (the "License");
+  ~     you may not use this file except in compliance with the License.
+  ~     You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~     Unless required by applicable law or agreed to in writing, software
+  ~     distributed under the License is distributed on an "AS IS" BASIS,
+  ~     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~     See the License for the specific language governing permissions and
+  ~     limitations under the License.
+  -->
+<layout>
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/example/src/main/res/layout/view_connect_session_view_model_row.xml b/example/src/main/res/layout/view_connect_session_view_model_row.xml
new file mode 100644
index 0000000..e238b48
--- /dev/null
+++ b/example/src/main/res/layout/view_connect_session_view_model_row.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2022 Jedlix B.V. The Netherlands
+  ~
+  ~     Licensed under the Apache License, Version 2.0 (the "License");
+  ~     you may not use this file except in compliance with the License.
+  ~     You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~     Unless required by applicable law or agreed to in writing, software
+  ~     distributed under the License is distributed on an "AS IS" BASIS,
+  ~     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~     See the License for the specific language governing permissions and
+  ~     limitations under the License.
+  -->
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.jedlix.sdk.example.viewModel.ConnectSessionViewModel" />
+    </data>
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@{viewModel.title}"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/buttons"
+            tools:text="Connect Session"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/buttons"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:modelButtons="@{viewModel.buttons}"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:itemCount="1"
+            tools:listitem="@layout/view_button_row"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/example/src/main/res/layout/view_grouped_connect_session_view_model_row.xml b/example/src/main/res/layout/view_grouped_connect_session_view_model_row.xml
new file mode 100644
index 0000000..c226a8e
--- /dev/null
+++ b/example/src/main/res/layout/view_grouped_connect_session_view_model_row.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2022 Jedlix B.V. The Netherlands
+  ~
+  ~     Licensed under the Apache License, Version 2.0 (the "License");
+  ~     you may not use this file except in compliance with the License.
+  ~     You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~     Unless required by applicable law or agreed to in writing, software
+  ~     distributed under the License is distributed on an "AS IS" BASIS,
+  ~     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~     See the License for the specific language governing permissions and
+  ~     limitations under the License.
+  -->
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.jedlix.sdk.example.viewModel.GroupedConnectSessionViewModel" />
+    </data>
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@{viewModel.title}"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/connect_sessions"
+            tools:text="Group title"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/connect_sessions"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:connectSessionViewModels="@{viewModel.connectSessionViewModels}"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:itemCount="2"
+            tools:listitem="@layout/view_connect_session_view_model_row"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 01f1dfc..10b267f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,4 +16,4 @@ androidxActivityVersion=1.4.0
 androidxLifecycleVersion=2.4.0
 androidxBrowserVersion=1.4.0
 
-sdkVersion=1.3.0
+sdkVersion=1.4.0
diff --git a/sdk/src/main/java/com/jedlix/sdk/JedlixSDK.kt b/sdk/src/main/java/com/jedlix/sdk/JedlixSDK.kt
index b3734b1..eea63c3 100644
--- a/sdk/src/main/java/com/jedlix/sdk/JedlixSDK.kt
+++ b/sdk/src/main/java/com/jedlix/sdk/JedlixSDK.kt
@@ -18,8 +18,8 @@ package com.jedlix.sdk
 
 import android.util.Log
 import com.jedlix.sdk.JedlixSDK.LogLevel.ERRORS
-import com.jedlix.sdk.networking.Authentication
 import com.jedlix.sdk.networking.Api
+import com.jedlix.sdk.networking.Authentication
 import com.jedlix.sdk.networking.KtorApi
 import com.jedlix.sdk.networking.endpoint.EndpointBuilder
 import java.net.URL
diff --git a/sdk/src/main/java/com/jedlix/sdk/model/ChargeState.kt b/sdk/src/main/java/com/jedlix/sdk/model/ChargeState.kt
index b1912fa..dee727f 100644
--- a/sdk/src/main/java/com/jedlix/sdk/model/ChargeState.kt
+++ b/sdk/src/main/java/com/jedlix/sdk/model/ChargeState.kt
@@ -16,6 +16,7 @@
 
 package com.jedlix.sdk.model
 
+import com.jedlix.sdk.serializer.EnumSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -52,5 +53,7 @@ enum class ChargeState {
      * Stopped charging
      */
     @SerialName("stopped")
-    STOPPED
+    STOPPED;
+
+    class Serializer : EnumSerializer<ChargeState>(UNKNOWN, serializer())
 }
diff --git a/sdk/src/main/java/com/jedlix/sdk/model/Charger.kt b/sdk/src/main/java/com/jedlix/sdk/model/Charger.kt
index 883cd36..38b03cc 100644
--- a/sdk/src/main/java/com/jedlix/sdk/model/Charger.kt
+++ b/sdk/src/main/java/com/jedlix/sdk/model/Charger.kt
@@ -42,4 +42,4 @@ data class Charger(
         val brand: String?,
         val model: String?
     )
-}
\ No newline at end of file
+}
diff --git a/sdk/src/main/java/com/jedlix/sdk/model/ChargerState.kt b/sdk/src/main/java/com/jedlix/sdk/model/ChargerState.kt
index 9c36ad9..55fb378 100644
--- a/sdk/src/main/java/com/jedlix/sdk/model/ChargerState.kt
+++ b/sdk/src/main/java/com/jedlix/sdk/model/ChargerState.kt
@@ -28,6 +28,7 @@ import java.util.*
  */
 @Serializable
 data class ChargerState(
+    @Serializable(with = ChargeState.Serializer::class)
     val chargeState: ChargeState,
     val chargePower: Double?,
     @Serializable(with = TimeStampSerializer::class)
diff --git a/sdk/src/main/java/com/jedlix/sdk/model/ChargingLocation.kt b/sdk/src/main/java/com/jedlix/sdk/model/ChargingLocation.kt
index 2fc5458..f80963a 100644
--- a/sdk/src/main/java/com/jedlix/sdk/model/ChargingLocation.kt
+++ b/sdk/src/main/java/com/jedlix/sdk/model/ChargingLocation.kt
@@ -43,8 +43,8 @@ data class ChargingLocation(
     val userId: String,
     val coordinates: Coordinates,
     val address: Address,
-    val energySupplierDetails: EnergySupplierDetails,
-    val tariffDetails: Tariff,
+    val energySupplierDetails: EnergySupplierDetails?,
+    val tariffDetails: Tariff?,
     val chargers: List<Charger> = emptyList(),
     @Serializable(with = ApiDateSerializer::class)
     val createdAt: Date,
diff --git a/sdk/src/main/java/com/jedlix/sdk/model/Tariff.kt b/sdk/src/main/java/com/jedlix/sdk/model/Tariff.kt
index e95c6d6..6143ae8 100644
--- a/sdk/src/main/java/com/jedlix/sdk/model/Tariff.kt
+++ b/sdk/src/main/java/com/jedlix/sdk/model/Tariff.kt
@@ -16,6 +16,7 @@
 
 package com.jedlix.sdk.model
 
+import com.jedlix.sdk.serializer.EnumSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -29,6 +30,7 @@ import kotlinx.serialization.Serializable
 data class Tariff(
     val currency: String? = null,
     val price: Double,
+    @Serializable(with = Type.Serializer::class)
     val type: Type
 ) {
     /**
@@ -45,6 +47,10 @@ data class Tariff(
         @SerialName("superOffPeak")
         SUPER_OFF_PEAK,
         @SerialName("dynamic")
-        DYNAMIC
+        DYNAMIC,
+        @SerialName("unknown")
+        UNKNOWN;
+
+        class Serializer : EnumSerializer<Type>(UNKNOWN, serializer())
     }
 }
diff --git a/sdk/src/main/java/com/jedlix/sdk/model/TariffInterval.kt b/sdk/src/main/java/com/jedlix/sdk/model/TariffInterval.kt
index 83f7443..43771d7 100644
--- a/sdk/src/main/java/com/jedlix/sdk/model/TariffInterval.kt
+++ b/sdk/src/main/java/com/jedlix/sdk/model/TariffInterval.kt
@@ -16,9 +16,16 @@
 
 package com.jedlix.sdk.model
 
+import com.jedlix.sdk.model.TariffInterval.DayOfWeek
+import com.jedlix.sdk.serializer.EnumSerializer
 import com.jedlix.sdk.serializer.TimeSerializer
+import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 import java.util.*
 
 /**
@@ -34,7 +41,7 @@ data class TariffInterval(
     val startTime: Date? = null,
     @Serializable(with = TimeSerializer::class)
     val endTime: Date? = null,
-    val daysOfWeek: List<DayOfWeek>,
+    val daysOfWeek: DayOfWeek.List,
     val tariffType: Tariff.Type
 ) {
     /**
@@ -56,5 +63,17 @@ data class TariffInterval(
         FRIDAY,
         @SerialName("saturday")
         SATURDAY,
+        @SerialName("unknown")
+        UNKNOWN;
+
+        @Serializable(with = ListSerializer::class)
+        data class List(val list: kotlin.collections.List<DayOfWeek>) : kotlin.collections.List<DayOfWeek> by list
+        class Serializer : EnumSerializer<DayOfWeek>(UNKNOWN, serializer())
+        class ListSerializer : KSerializer<List> {
+            private val internal = ListSerializer(Serializer())
+            override val descriptor: SerialDescriptor = internal.descriptor
+            override fun serialize(encoder: Encoder, value: List) = internal.serialize(encoder, value)
+            override fun deserialize(decoder: Decoder): List = List(internal.deserialize(decoder))
+        }
     }
 }
diff --git a/sdk/src/main/java/com/jedlix/sdk/model/Vehicle.kt b/sdk/src/main/java/com/jedlix/sdk/model/Vehicle.kt
index 6bbf985..ffd3794 100644
--- a/sdk/src/main/java/com/jedlix/sdk/model/Vehicle.kt
+++ b/sdk/src/main/java/com/jedlix/sdk/model/Vehicle.kt
@@ -16,9 +16,17 @@
 
 package com.jedlix.sdk.model
 
+import com.jedlix.sdk.model.Vehicle.Capabilities
+import com.jedlix.sdk.model.Vehicle.Details
 import com.jedlix.sdk.serializer.ApiDateSerializer
+import com.jedlix.sdk.serializer.EnumSerializer
+import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 import java.util.*
 
 /**
@@ -27,6 +35,7 @@ import java.util.*
  * @property createdAt The [Date] in UTC when the vehicle was created
  * @property details The [Details] of the vehicle
  * @property isConnected Indicates whether this vehicle is connected or not
+ * @property isConnectable Indicates whether this vehicle is connectable
  * @property capabilities List of [Capabilities] supported by the vehicle
  * @property chargeState The [VehicleChargeState] of the vehicle
  */
@@ -37,7 +46,8 @@ class Vehicle(
     val createdAt: Date,
     val details: Details,
     val isConnected: Boolean,
-    val capabilities: List<Capabilities>? = null,
+    val isConnectable: Boolean,
+    val capabilities: Capabilities.List? = null,
     val chargeState: VehicleChargeState? = null
 ) {
     /**
@@ -70,6 +80,9 @@ class Vehicle(
         @SerialName("discharge")
         DISCHARGE,
 
+        @SerialName("startStopCharging")
+        START_STOP_CHARGING,
+
         @SerialName("geoLocation")
         GEO_LOCATION,
 
@@ -89,6 +102,22 @@ class Vehicle(
         PUSH_TELEMETRY,
 
         @SerialName("geoFencing")
-        GEO_FENCING
+        GEO_FENCING,
+
+        @SerialName("unknown")
+        UNKNOWN;
+
+        @Serializable(with = ListSerializer::class)
+        data class List(val list: kotlin.collections.List<Capabilities>) : kotlin.collections.List<Capabilities> by list
+        class Serializer : EnumSerializer<Capabilities>(
+            UNKNOWN,
+            serializer()
+        )
+        class ListSerializer : KSerializer<List> {
+            private val internal = ListSerializer(Serializer())
+            override val descriptor: SerialDescriptor = internal.descriptor
+            override fun serialize(encoder: Encoder, value: List) = internal.serialize(encoder, value)
+            override fun deserialize(decoder: Decoder): List = List(internal.deserialize(decoder))
+        }
     }
 }
diff --git a/sdk/src/main/java/com/jedlix/sdk/model/VehicleChargeState.kt b/sdk/src/main/java/com/jedlix/sdk/model/VehicleChargeState.kt
index 27ee238..b356720 100644
--- a/sdk/src/main/java/com/jedlix/sdk/model/VehicleChargeState.kt
+++ b/sdk/src/main/java/com/jedlix/sdk/model/VehicleChargeState.kt
@@ -31,6 +31,7 @@ import java.util.*
 data class VehicleChargeState(
     val batteryLevel: Int,
     val range: Int,
+    @Serializable(with = ChargeState.Serializer::class)
     val chargeState: ChargeState,
     @Serializable(with = ApiDateSerializer::class)
     val updatedAt: Date
diff --git a/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/ChargerDescriptor.kt b/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/ChargerDescriptor.kt
index ced2b55..a9644d2 100644
--- a/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/ChargerDescriptor.kt
+++ b/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/ChargerDescriptor.kt
@@ -67,4 +67,4 @@ internal object ChargerStateDescriptor : EndpointResultDescriptor<ChargerState>
             HttpStatusCode.NotFound.value -> apiException.toDefaultApiError()
             else -> null
         }
-}
\ No newline at end of file
+}
diff --git a/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/ChargingLocationDescriptor.kt b/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/ChargingLocationDescriptor.kt
index f717bc6..849e46a 100644
--- a/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/ChargingLocationDescriptor.kt
+++ b/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/ChargingLocationDescriptor.kt
@@ -54,4 +54,4 @@ internal object ChargingLocationDeleteDescriptor : EndpointResultDescriptor<Unit
             HttpStatusCode.NotFound.value -> apiException.toDefaultApiError()
             else -> null
         }
-}
\ No newline at end of file
+}
diff --git a/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/ConnectSessionsDescriptor.kt b/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/ConnectSessionsDescriptor.kt
index 0db1ad5..34dbd76 100644
--- a/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/ConnectSessionsDescriptor.kt
+++ b/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/ConnectSessionsDescriptor.kt
@@ -16,9 +16,7 @@
 
 package com.jedlix.sdk.networking.endpoint
 
-import com.jedlix.sdk.model.ChargerConnectSession
 import com.jedlix.sdk.model.ConnectSessionDescriptor
-import com.jedlix.sdk.model.VehicleConnectSession
 import com.jedlix.sdk.networking.ApiException
 import com.jedlix.sdk.networking.Error
 import io.ktor.http.*
@@ -50,7 +48,7 @@ internal sealed class ConnectSessionsDescriptor<ConnectSession : ConnectSessionD
     }
 }
 
-internal class ConnectSessionListDescriptor<ConnectSession : ConnectSessionDescriptor>(serializer: KSerializer<ConnectSession>)  : EndpointResultDescriptor<List<ConnectSession>> {
+internal class ConnectSessionListDescriptor<ConnectSession : ConnectSessionDescriptor>(serializer: KSerializer<ConnectSession>) : EndpointResultDescriptor<List<ConnectSession>> {
     override val serializer = ListSerializer(serializer)
     override fun toError(apiException: ApiException): Error? =
         when (apiException.code) {
diff --git a/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/EndpointBuilder.kt b/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/EndpointBuilder.kt
index 1a242dc..aab90ce 100644
--- a/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/EndpointBuilder.kt
+++ b/sdk/src/main/java/com/jedlix/sdk/networking/endpoint/EndpointBuilder.kt
@@ -102,7 +102,7 @@ class EndpointBuilder internal constructor() : EndpointPath {
                     )
                 }
 
-                inner class ChargingLocation(chargingLocationId : String) : EndpointPath {
+                inner class ChargingLocation(chargingLocationId: String) : EndpointPath {
                     override val path: String = "${this@ChargingLocations.path}/$chargingLocationId"
 
                     inner class Get : EndpointNode<com.jedlix.sdk.model.ChargingLocation> {
diff --git a/sdk/src/main/java/com/jedlix/sdk/serializer/EnumSerializer.kt b/sdk/src/main/java/com/jedlix/sdk/serializer/EnumSerializer.kt
new file mode 100644
index 0000000..2c226a2
--- /dev/null
+++ b/sdk/src/main/java/com/jedlix/sdk/serializer/EnumSerializer.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 Jedlix B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.jedlix.sdk.serializer
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+open class EnumSerializer<E>(private val defaultValue: E, private val internalSerializer: KSerializer<E>) :
+    KSerializer<E> where E : Enum<E> {
+
+    private val className = this::class.qualifiedName!!
+    override val descriptor = internalSerializer.descriptor
+    override fun serialize(encoder: Encoder, value: E) = internalSerializer.serialize(encoder, value)
+
+    override fun deserialize(decoder: Decoder) = try {
+        internalSerializer.deserialize(decoder)
+    } catch (e: SerializationException) {
+        defaultValue
+    }
+}