diff --git a/cocli.exe b/cocli.exe
index 99b074c..cf038e2 100644
Binary files a/cocli.exe and b/cocli.exe differ
diff --git a/data/coswid/coswid-full.cbor b/data/coswid/coswid-full.cbor
index ab74c80..3fcdce7 100644
Binary files a/data/coswid/coswid-full.cbor and b/data/coswid/coswid-full.cbor differ
diff --git a/data/coswid/coswid-meta-full.cbor b/data/coswid/coswid-meta-full.cbor
new file mode 100644
index 0000000..7b42dc9
Binary files /dev/null and b/data/coswid/coswid-meta-full.cbor differ
diff --git a/data/coswid/coswid-meta-mini.cbor b/data/coswid/coswid-meta-mini.cbor
new file mode 100644
index 0000000..7b42dc9
Binary files /dev/null and b/data/coswid/coswid-meta-mini.cbor differ
diff --git a/data/coswid/templates/coswid-full.json b/data/coswid/templates/coswid-full.json
index 5315305..a12293e 100644
--- a/data/coswid/templates/coswid-full.json
+++ b/data/coswid/templates/coswid-full.json
@@ -4,33 +4,32 @@
   "software-name": "Example Software",
   "profile": "http://example.com/cosmid/profile/1",
   "validity": {
-      "not-before": "2023-01-01T00:00:00Z",
-      "not-after": "2025-01-01T00:00:00Z"
+    "not-before": "2023-01-01T00:00:00Z",
+    "not-after": "2025-01-01T00:00:00Z"
   },
   "entity": [
-      {
-          "entity-name": "Example Ltd.",
-          "reg-id": "https://example.com",
-          "role": [
-              "tag-creator"
-          ]
-      }
+    {
+      "entity-name": "Example Ltd signing key",
+      "reg-id": "https://example.com",
+      "role": ["tag-creator"]
+    }
   ],
+  "version-scheme": "multipartnumeric",
   "link": [
-      {
-          "rel": "parent",
-          "href": "https://parent.example/rims/ccb3aa85-61b4-40f1-848e-02ad6e8a254b",
-          "thumbprint": {
-              "hash-alg-id": 1,
-              "hash-value": "5Fty9cDAtXLbTY06t+l/No/3TmI0eoJN7LZ6hOUiTXU="
-          }
+    {
+      "rel": "parent",
+      "href": "https://parent.example/rims/ccb3aa85-61b4-40f1-848e-02ad6e8a254b",
+      "thumbprint": {
+        "hash-alg-id": 1,
+        "hash-value": "5Fty9cDAtXLbTY06t+l/No/3TmI0eoJN7LZ6hOUiTXU="
       }
+    }
   ],
   "payload": {
-      "data": "Sample payload data"
+    "data": "Sample payload data"
   },
   "evidence": {
-      "type": "example-evidence",
-      "value": "Evidence details"
+    "type": "example-evidence",
+    "value": "Evidence details"
   }
 }
\ No newline at end of file
diff --git a/data/coswid/templates/coswid-meta-full.json b/data/coswid/templates/coswid-meta-full.json
index 216e36d..158d43c 100644
--- a/data/coswid/templates/coswid-meta-full.json
+++ b/data/coswid/templates/coswid-meta-full.json
@@ -1,17 +1,17 @@
 {
-  "signer": {
+  "tag-id": "123e4567-e89b-12d3-a456-426614174000",
+  "tag-version": 1,
+  "software-name": "Example Software",
+  "profile": "http://example.com/cosmid/profile/1",
+  "validity": {
+    "not-before": "2023-01-01T00:00:00Z",
+    "not-after": "2025-01-01T00:00:00Z"
+  },
+  "entity": [
+    {
       "entity-name": "Example Ltd signing key",
       "reg-id": "https://example.com",
-      "role": [
-          "tag-creator"
-      ],
-      "thumbprint": {
-          "hash-alg-id": 1,
-          "hash-value": "dGVzdGhhc2g="
-      }
-  },
-  "validity": {
-      "not-before": "2023-01-01T00:00:00Z",
-      "not-after": "2025-01-01T00:00:00Z"
-  }
+      "role": ["tag-creator"]
+    }
+  ]
 }
\ No newline at end of file
diff --git a/data/coswid/templates/coswid-meta-mini.json b/data/coswid/templates/coswid-meta-mini.json
index b8193e1..0aabbd8 100644
--- a/data/coswid/templates/coswid-meta-mini.json
+++ b/data/coswid/templates/coswid-meta-mini.json
@@ -1,8 +1,13 @@
 {
-  "signer": {
+  "tag-id": "123e4567-e89b-12d3-a456-426614174000",
+  "tag-version": 1,
+  "software-name": "Example Software",
+  "profile": "http://example.com/cosmid/profile/1",
+  "entity": [
+    {
       "entity-name": "Example Ltd signing key",
-      "role": [
-          "tag-creator"
-      ]
-  }
-}
\ No newline at end of file
+      "reg-id": "https://example.com",
+      "role": ["tag-creator"]
+    }
+  ]
+}