diff --git a/iat-verifier/scripts/compile_token b/iat-verifier/scripts/compile_token
index 609e2c2..22fbe23 100755
--- a/iat-verifier/scripts/compile_token
+++ b/iat-verifier/scripts/compile_token
@@ -20,6 +20,10 @@
 if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO)
 
+    token_verifiers = {
+        "PSA-IoT-Profile1-token": PSAIoTProfile1TokenVerifier,
+    }
+
     parser = argparse.ArgumentParser()
     parser.add_argument('source', help='Token source in YAML format')
     parser.add_argument('-o', '--outfile',
@@ -36,6 +40,10 @@
     group.add_argument('-m', '--hmac', action='store_true',
                        help='''Generate a token wrapped in a Mac0 rather than
                        Sign1 COSE structure.''')
+    parser.add_argument('-t', '--token-type',
+                        help='''The type of the Token.''',
+                        choices=token_verifiers.keys(),
+                        required=True)
 
     args = parser.parse_args()
     signing_key = None
@@ -58,7 +66,7 @@
             with open(args.keyfile) as fh:
                 signing_key = SigningKey.from_pem(fh.read())
 
-    verifier = PSAIoTProfile1TokenVerifier.get_verifier()
+    verifier = token_verifiers[args.token_type].get_verifier()
     if verifier.method != method:
         verifier.method = method
     if cose_alg is not None and verifier.cose_alg != cose_alg:
diff --git a/iat-verifier/scripts/decompile_token b/iat-verifier/scripts/decompile_token
index cc74e12..d61247f 100755
--- a/iat-verifier/scripts/decompile_token
+++ b/iat-verifier/scripts/decompile_token
@@ -15,14 +15,23 @@
 
 
 if __name__ == '__main__':
+
+    token_verifiers = {
+        "PSA-IoT-Profile1-token": PSAIoTProfile1TokenVerifier,
+    }
+
     parser = argparse.ArgumentParser()
     parser.add_argument('source', help='A compiled COSE IAT token.')
     parser.add_argument('-o', '--outfile',
                         help='''Output file for the depompiled claims. If this is not
                         specified, the claims will be written to standard output.''')
+    parser.add_argument('-t', '--token-type',
+                        help='''The type of the Token.''',
+                        choices=token_verifiers.keys(),
+                        required=True)
     args = parser.parse_args()
 
-    verifier = PSAIoTProfile1TokenVerifier.get_verifier()
+    verifier = token_verifiers[args.token_type].get_verifier()
     with open(args.source, 'rb') as fh:
         token_map = convert_token_to_map(fh.read(), verifier)