diff --git a/lib/eudi/mdoc.ex b/lib/eudi/mdoc.ex
index 87777ba..bb9434b 100644
--- a/lib/eudi/mdoc.ex
+++ b/lib/eudi/mdoc.ex
@@ -40,13 +40,14 @@ defmodule CA.MDoc do
       version = :maps.get("version", map, [])
       validityInfo = :maps.get("validityInfo", map, [])
       valueDigests = :maps.get("valueDigests", map, [])
+      [{_,nameSpacesList}] = :maps.to_list(valueDigests)
       [
         docType: docType,
         digestAlgorithm: da,
         deviceKeyInfo: dki,
         validityInfo: validityInfo,
         status: status,
-        valueDigests: valueDigests,
+        valueDigests: :lists.map(fn x -> parseTag(x) end, nameSpacesList),
         version: version,
       ]
   end
@@ -56,13 +57,17 @@ defmodule CA.MDoc do
   end
 
   def parseTag(%{33 => %CBOR.Tag{tag: type, value: value}}) when is_binary(value) do
-      {:ok, cbor, _} = decode(value)
       [tag: {33,type}, value: :base64.encode(value)]
   end
 
+  def parseTag(%{33 => tags}) when is_list(tags) do
+      :lists.map(fn %CBOR.Tag{tag: type, value: value} ->
+        [tag: {33,type}, value: :base64.encode(value)]
+      end, tags)
+  end
+
   def parseTag(%{33 => %CBOR.Tag{tag: type, value: value}}) do
-      {:ok, cbor, _} = decode(value)
-      [tag: {33,type}, value: cbor]
+      [tag: {33,type}, value: :base64.encode(value)]
   end
 
   def parseTag(%CBOR.Tag{tag: :bytes, value: bytes}) when is_binary(bytes) do
@@ -71,11 +76,12 @@ defmodule CA.MDoc do
              {:ok, cbor, _} -> [tag: :bytes, decoded: true, value: parseTag(cbor)]
         end
       rescue _ ->
-         [tag: :bytes, value: :base64.encode(bytes)]
+         [tag: :bytes, value: :base64.encode(bytes), raw: true]
       end
   end
 
   def parseTag(%CBOR.Tag{tag: :simple, value: bytes}) when is_binary(bytes) do
+      {:ok, cbor, _} = decode(bytes)
       [tag: :simple, value: :base64.encode(bytes)]
   end
 
@@ -101,14 +107,29 @@ defmodule CA.MDoc do
 
   def parseTag(value) do value end
 
+  def parseMDoc(%{"deviceAuth"=> %{"deviceSignature" => tags}, "nameSpaces"=> ns}) do
+      [
+        deviceAuth: [deviceSignature: :lists.map(fn x -> parseTag(x) end, tags)],
+        nameSpaces: :lists.map(fn x -> parseTag(x) end, :lists.flatten([ns])),
+      ]
+  end
+
   def parseMDoc(%{"issuerAuth"=> [f,s|issuerAuth], "nameSpaces"=> nameSpaces}) do
-      [{name,nameSpacesList}] = :maps.to_list(nameSpaces)
+      [{name,ns}] = :maps.to_list(nameSpaces)
       [
-        ns: name,
         header: parseTag(f),
-        certificate: parseTag(s),
+        certificates: parseTag(s),
         issuerAuth: :lists.map(fn x -> parseTag(x) end, issuerAuth),
-        nameSpaces: :lists.map(fn x -> parseTag(x) end, nameSpacesList),
+        nameSpaces: :lists.map(fn x -> parseTag(x) end, :lists.flatten([ns])),
+        docType: name,
+      ]
+  end
+
+  def parseMDoc(%{"issuerSigned"=> issuerSigned, "deviceSigned"=> deviceSigned, "docType" => docType}) do
+      [
+        issuerSigned: parseMDoc(issuerSigned),
+        deviceSigned: parseMDoc(deviceSigned),
+        docType: docType
       ]
   end
 
diff --git a/test/cbor/hiid.b64 b/test/mdoc/hiid.b64
similarity index 100%
rename from test/cbor/hiid.b64
rename to test/mdoc/hiid.b64
diff --git a/test/cbor/iban.b64 b/test/mdoc/iban.b64
similarity index 100%
rename from test/cbor/iban.b64
rename to test/mdoc/iban.b64
diff --git a/test/cbor/mDL.hex b/test/mdoc/mDL.hex
similarity index 100%
rename from test/cbor/mDL.hex
rename to test/mdoc/mDL.hex
diff --git a/test/mdoc/pid.b64u b/test/mdoc/pid.b64u
new file mode 100644
index 0000000..9bab52e
--- /dev/null
+++ b/test/mdoc/pid.b64u
@@ -0,0 +1 @@
+omppc3N1ZXJBdXRohEOhASahGCFZAugwggLkMIICaqADAgECAhRyMm32Ywiae1APjD8mpoXLwsLSyjAKBggqhkjOPQQDAjBcMR4wHAYDVQQDDBVQSUQgSXNzdWVyIENBIC0gVVQgMDExLTArBgNVBAoMJEVVREkgV2FsbGV0IFJlZmVyZW5jZSBJbXBsZW1lbnRhdGlvbjELMAkGA1UEBhMCVVQwHhcNMjMwOTAyMTc0MjUxWhcNMjQxMTI1MTc0MjUwWjBUMRYwFAYDVQQDDA1QSUQgRFMgLSAwMDAxMS0wKwYDVQQKDCRFVURJIFdhbGxldCBSZWZlcmVuY2UgSW1wbGVtZW50YXRpb24xCzAJBgNVBAYTAlVUMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAESQR81BwtG6ZqjrWQYWWw5pPeGxzlr3ptXIr3ftI93rJ_KvC9TAgqJTakJAj2nV4yQGLJl0tw-PhwfbHDrIYsWKOCARAwggEMMB8GA1UdIwQYMBaAFLNsuJEXHNekGmYxh0Lhi8BAzJUbMBYGA1UdJQEB_wQMMAoGCCuBAgIAAAECMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHBzOi8vcHJlcHJvZC5wa2kuZXVkaXcuZGV2L2NybC9waWRfQ0FfVVRfMDEuY3JsMB0GA1UdDgQWBBSB7_ScXIMKUKZGvvdQeFpTPj_YmzAOBgNVHQ8BAf8EBAMCB4AwXQYDVR0SBFYwVIZSaHR0cHM6Ly9naXRodWIuY29tL2V1LWRpZ2l0YWwtaWRlbnRpdHktd2FsbGV0L2FyY2hpdGVjdHVyZS1hbmQtcmVmZXJlbmNlLWZyYW1ld29yazAKBggqhkjOPQQDAgNoADBlAjBF-tqi7y2VU-u0iETYZBrQKp46jkord9ri9B55Xy8tkJsD8oEJlGtOLZKDrX_BoYUCMQCbnk7tUBCfXw63ACzPmLP-5BFAfmXuMPsBBL7Wc4Lqg94fXMSI5hAXZAEyJ0NATQpZA3LYGFkDbadmc3RhdHVzoW5TdGF0dXNMaXN0SW5mb6Jrc3RhdHVzX2xpc3SiY2lkeBhDY3VyaXhnaHR0cHM6Ly9pc3N1ZXIuZXVkaXcuZGV2L3Rva2VuX3N0YXR1c19saXN0L2V1LmV1cm9wYS5lYy5ldWRpLnBpZC4xLzAwNWJmOTA5LWJhYWMtNGE0NC05Njk0LTk2ODBhNTY4NTBjOW9pZGVudGlmaWVyX2xpc3SiYmlkGENjdXJpeGVodHRwczovL2lzc3Vlci5ldWRpdy5kZXYvaWRlbnRpZmllcl9saXN0L2V1LmV1cm9wYS5lYy5ldWRpLnBpZC4xLzAwNWJmOTA5LWJhYWMtNGE0NC05Njk0LTk2ODBhNTY4NTBjOWdkb2NUeXBld2V1LmV1cm9wYS5lYy5ldWRpLnBpZC4xZ3ZlcnNpb25jMS4wbHZhbGlkaXR5SW5mb6Nmc2lnbmVkwHQyMDI0LTExLTIxVDAxOjEwOjQxWml2YWxpZEZyb23AdDIwMjQtMTEtMjFUMDE6MTA6NDFaanZhbGlkVW50aWzAdDIwMjUtMDItMTlUMDA6MDA6MDBabHZhbHVlRGlnZXN0c6F3ZXUuZXVyb3BhLmVjLmV1ZGkucGlkLjGoAFggF3Z3Eg1YeauLK_9oSQNeUUOQjYEtaiUR7C-zlEZX_O4BWCDhc6_430vmHqQBLWWwwue-aMM6JYegqDmb0a6BHlFXvwJYIFhynlqQvMKqdhsisckAwKyB8uMy702GBXj3bynVBormA1ggt_jVUHav8ziGAwDFDjk52uOb4wRM3wnkfOkBf237PwoEWCBxxzkmm9QtFmIksGxTJeR78reejHtlDm4edLCy_dqY5gVYIBBu13glDXIT-rFU6prT4QIwsUGXpqDjROUoXzc4_Pe0BlggxoeOMgBphVvHVneLH5hWECuAX-J3ik1VHGNc_OeTcsEHWCDdLPK1T_EYhKx5mm03y3QY-SqfFOFGiHTBG_NNsXHGM21kZXZpY2VLZXlJbmZvoWlkZXZpY2VLZXmkAQIgASFYID0sUKw9s5dP5l3AKs9ZoKkngaAYZ5sdssQRKawWPBdtIlggxV8fbi1FSosUunLeuLNuLkJiqmY6TKiMnur-Gn2wR11vZGlnZXN0QWxnb3JpdGhtZ1NIQS0yNTZYQHVS43sSOF-4I_smLNk67mE3FdyzjDbyDoOmTDaoLVHHoHP-K3yV6d_DWdC3Rio5VCUOj0fqIAYTDyw-PsPxAfdqbmFtZVNwYWNlc6F3ZXUuZXVyb3BhLmVjLmV1ZGkucGlkLjGI2BhYdaRmcmFuZG9tWCCSvFyU_caWt5BrzqQI2veHhKJW8OPuXDhIBLRXDgRv2WhkaWdlc3RJRABsZWxlbWVudFZhbHVlb1Rlc3QgUElEIGlzc3VlcnFlbGVtZW50SWRlbnRpZmllcnFpc3N1aW5nX2F1dGhvcml0edgYWG2kZnJhbmRvbVggc_oeAJZaPctYXy_1oYpbkOdM9oioBLka7kM-_XuZepRoZGlnZXN0SUQBbGVsZW1lbnRWYWx1ZdkD7GoyMDI1LTAyLTE5cWVsZW1lbnRJZGVudGlmaWVya2V4cGlyeV9kYXRl2BhYbKRmcmFuZG9tWCAgVmP4xqGipJOp-y9TKjuaxrnBEqBJA6S-f0w742ELGWhkaWdlc3RJRAJsZWxlbWVudFZhbHVl2QPsajE5ODAtMDEtMDFxZWxlbWVudElkZW50aWZpZXJqYmlydGhfZGF0ZdgYWG-kZnJhbmRvbVggl5cWPjSxVVXFSPChrLMqT4-WutEfLgLs5nJQG-qqWaloZGlnZXN0SUQDbGVsZW1lbnRWYWx1ZdkD7GoyMDI0LTExLTIxcWVsZW1lbnRJZGVudGlmaWVybWlzc3VhbmNlX2RhdGXYGFhgpGZyYW5kb21YIBJfFHlPiYHpKla62AmFzL92r_NHjRjmrfVCFxKxUCxWaGRpZ2VzdElEBGxlbGVtZW50VmFsdWX1cWVsZW1lbnRJZGVudGlmaWVya2FnZV9vdmVyXzE42BhYYqRmcmFuZG9tWCCMS1p-NsQ0CGdTQQtEd-cPhaTu_5kfPNqEq9sTdVjeP2hkaWdlc3RJRAVsZWxlbWVudFZhbHVlYzEyM3FlbGVtZW50SWRlbnRpZmllcmpnaXZlbl9uYW1l2BhYY6RmcmFuZG9tWCAJNt7ZLzc1TLMDxhu4ac_V_umhibQyLc_1gJdGpGku0WhkaWdlc3RJRAZsZWxlbWVudFZhbHVlYzEyM3FlbGVtZW50SWRlbnRpZmllcmtmYW1pbHlfbmFtZdgYWGakZnJhbmRvbVggKKHLeKLy4Dsc3-gWyNRF0caxns4uyWfZ8Z2vbZQxUF9oZGlnZXN0SUQHbGVsZW1lbnRWYWx1ZWJGQ3FlbGVtZW50SWRlbnRpZmllcm9pc3N1aW5nX2NvdW50cnk=
\ No newline at end of file
diff --git a/test/cbor/tax.b64u b/test/mdoc/tax.b64u
similarity index 100%
rename from test/cbor/tax.b64u
rename to test/mdoc/tax.b64u