diff --git a/followthemoney/schema/LegalEntity.yaml b/followthemoney/schema/LegalEntity.yaml
index 2ccb53813..87991d0c3 100644
--- a/followthemoney/schema/LegalEntity.yaml
+++ b/followthemoney/schema/LegalEntity.yaml
@@ -79,6 +79,10 @@ LegalEntity:
       label: Tax Number
       type: identifier
       description: "Tax identification number"
+    licenseNumber:
+      label: License Number
+      type: identifier
+      description: "For licenses granted to an entity"
     vatCode:
       label: "V.A.T. Identifier"
       description: "(EU) VAT number"
@@ -134,6 +138,7 @@ LegalEntity:
       label: "Unique Entity ID"
       description: "UEI from SAM.gov"
       type: identifier
+      format: uei
       maxLength: 32
     npiCode:
       label: "NPI"
diff --git a/followthemoney/schema/Person.yaml b/followthemoney/schema/Person.yaml
index 27f434fe3..316961361 100644
--- a/followthemoney/schema/Person.yaml
+++ b/followthemoney/schema/Person.yaml
@@ -75,6 +75,7 @@ Person:
     socialSecurityNumber:
       label: Social security number
       type: identifier
+      format: ssn
     gender:
       label: Gender
       type: gender
diff --git a/followthemoney/schema/Vessel.yaml b/followthemoney/schema/Vessel.yaml
index 2418180be..c65deea0c 100644
--- a/followthemoney/schema/Vessel.yaml
+++ b/followthemoney/schema/Vessel.yaml
@@ -20,6 +20,7 @@ Vessel:
     imoNumber:
       label: IMO Number
       type: identifier
+      format: imo
       maxLength: 16
     crsNumber:
       label: CRS Number
diff --git a/js/src/defaultModel.json b/js/src/defaultModel.json
index 04510edea..da8e795ec 100644
--- a/js/src/defaultModel.json
+++ b/js/src/defaultModel.json
@@ -3569,6 +3569,15 @@
           "qname": "LegalEntity:leiCode",
           "type": "identifier"
         },
+        "licenseNumber": {
+          "description": "For licenses granted to an entity",
+          "label": "License Number",
+          "matchable": true,
+          "maxLength": 64,
+          "name": "licenseNumber",
+          "qname": "LegalEntity:licenseNumber",
+          "type": "identifier"
+        },
         "mainCountry": {
           "description": "Primary country of this entity",
           "label": "Country of origin",
@@ -3850,6 +3859,7 @@
         },
         "uniqueEntityId": {
           "description": "UEI from SAM.gov",
+          "format": "uei",
           "label": "Unique Entity ID",
           "matchable": true,
           "maxLength": 32,
@@ -5179,6 +5189,7 @@
           "type": "string"
         },
         "socialSecurityNumber": {
+          "format": "ssn",
           "label": "Social security number",
           "matchable": true,
           "maxLength": 64,
@@ -6975,6 +6986,7 @@
           "type": "number"
         },
         "imoNumber": {
+          "format": "imo",
           "label": "IMO Number",
           "matchable": true,
           "maxLength": 16,
diff --git a/setup.py b/setup.py
index f9a7dbcf0..d01e72d6a 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@
         "types-PyYAML",
         "sqlalchemy2-stubs",
         "banal >= 1.0.6, < 1.1.0",
-        "rigour >= 0.7.2, < 1.0.0",
+        "rigour >= 0.7.4, < 1.0.0",
         "click >= 8.0, < 9.0.0",
         "stringcase >= 1.2.0, < 2.0.0",
         "requests >= 2.21.0, < 3.0.0",