diff --git a/src/main/java/org/pythonbyte/haveibeenkwned/domain/KpasswordlessCredential.kt b/src/main/java/org/pythonbyte/haveibeenkwned/domain/KpasswordlessCredential.kt
index 0078bbe..3ba0a46 100644
--- a/src/main/java/org/pythonbyte/haveibeenkwned/domain/KpasswordlessCredential.kt
+++ b/src/main/java/org/pythonbyte/haveibeenkwned/domain/KpasswordlessCredential.kt
@@ -3,6 +3,8 @@ package org.pythonbyte.haveibeenkwned.domain
 import org.pythonbyte.krux.json.JsonObject
 
 class KpasswordlessCredential {
+    var id = ""
+    var type = ""
     var publicKey = ""
     var userHandle = ""
     var origin = ""
@@ -14,6 +16,10 @@ class KpasswordlessCredential {
             return array.map { jsonObject ->
                 val credential = KpasswordlessCredential()
 
+                val descriptorObject = jsonObject.getObject("descriptor")
+
+                credential.id = descriptorObject.getString("id")
+                credential.type = descriptorObject.getString( "type" )
                 credential.publicKey = jsonObject.getString("publicKey")
                 credential.userHandle = jsonObject.getString("userHandle")
                 credential.origin = jsonObject.getString("origin")
diff --git a/src/test/java/org/pythonbyte/haveibeenkwned/service/KpasswordlessServiceTest.kt b/src/test/java/org/pythonbyte/haveibeenkwned/service/KpasswordlessServiceTest.kt
index afadf9c..b873757 100644
--- a/src/test/java/org/pythonbyte/haveibeenkwned/service/KpasswordlessServiceTest.kt
+++ b/src/test/java/org/pythonbyte/haveibeenkwned/service/KpasswordlessServiceTest.kt
@@ -44,6 +44,8 @@ class KpasswordlessServiceTest {
         assertTrue( credentials.size > 0 )
 
         credentials.forEach { credential ->
+            println("Id: " + credential.id)
+            println("Type: " + credential.type)
             println("User Handle: " + credential.userHandle)
             println("Device: " + credential.device)
         }