diff --git a/src/main/java/com/bunq/sdk/context/SessionContext.java b/src/main/java/com/bunq/sdk/context/SessionContext.java
index 3e28ca07..a391a1ac 100644
--- a/src/main/java/com/bunq/sdk/context/SessionContext.java
+++ b/src/main/java/com/bunq/sdk/context/SessionContext.java
@@ -55,21 +55,7 @@ public class SessionContext implements java.io.Serializable {
   }
 
   private int getUserId(BunqModel user) {
-    if (user instanceof UserPerson) {
-      return ((UserPerson) user).getId();
-    } else if (user instanceof UserCompany) {
-      return ((UserCompany) user).getId();
-    } else if (user instanceof UserApiKey) {
-      return ((UserApiKey) user).getId();
-    } else if (user instanceof UserPaymentServiceProvider) {
-      return ((UserPaymentServiceProvider) user).getId();
-    } else {
-      throw new BunqException(
-          String.format(
-              ERROR_UNEXPECTED_USER_TYPE, user.getClass().toString()
-          )
-      );
-    }
+    return user.getId();
   }
 
   private static Date calculateExpiryTime(SessionServer sessionServer) {
diff --git a/src/main/java/com/bunq/sdk/model/core/BunqModel.java b/src/main/java/com/bunq/sdk/model/core/BunqModel.java
index 8d7eb076..b61aab14 100644
--- a/src/main/java/com/bunq/sdk/model/core/BunqModel.java
+++ b/src/main/java/com/bunq/sdk/model/core/BunqModel.java
@@ -196,5 +196,7 @@ protected static byte[] determineAllRequestByte(HashMap<String, Object> requestM
 
     return requestString.replaceAll(REGEX_FIELD_FOR_REQUEST, STRING_EMPTY).getBytes();
   }
+  
+  abstract public Integer getId();
 
 }