diff --git a/definitions.json b/definitions.json
index 3629fc7..2633140 100644
--- a/definitions.json
+++ b/definitions.json
@@ -283,11 +283,13 @@
       ]
    },
    "South African Passport": {
-      "regex": "^[0-9a-z]{8,}$",
+      "regex": "(?:P<ZAF|PMZAF)<<(?:[A-Z0-9<].+)",
       "region": "South Africa",
       "keywords": [
          "South Africa",
-         "Republique"
+         "Republique",
+         "ZAF",
+         "Passport"
       ]
    },
    "South Korean Passport": {
@@ -320,47 +322,49 @@
       ]
    },
    "Palestinian Passport": {
-      "regex": "^[0-9]{7,}$",
+      "regex": "(?:P<PSE|PDPSE)(?:[A-Z0-9<].+)",
       "region": "Palestine",
       "keywords": [
          "Palestinian",
-         "Authority",
+         "Palestine",
          "Passport",
-         "Issuing",
-         "Authority"
+         "PSE"
       ]
    },
    "Australian Passport": {
-      "regex": "^[a-z0-9]{6}$",
+      "regex": "(?:P<PSE|PDPSE)(?:[A-Z0-9<].+)",
       "region": "Australia",
       "keywords": [
          "Australia",
-         "Code",
          "Passport",
-         "Issuing",
-         "State",
-         "Authority",
-         "Document"
+         "AUS",
+         "Australian"
       ]
    },
    "Canadian Passport": {
-      "regex": "(?:P<GBR)(?:[A-Z0-9<].+)",
+      "regex": "(?:P<CAN|PPCAN)(?:[A-Z0-9<].+)",
       "region": "Canada",
       "keywords": [
          "PPCAN",
          "P<CAN",
          "CAN",
-         "<<<"
+         "<<<",
+         "Passport",
+         "Canadian"
       ]
    },
    "Irish Public Services Card": {
-      "regex": null,
+      "regex": "[A-Z][0-9]{7}",
       "region": "Ireland",
       "keywords": [
          "Public",
          "Services",
          "Card",
-         "Ireland"
+         "Ireland",
+         "Eire",
+         "Carta",
+         "Seirbhisi",
+         "Poibli"
       ]
    }
 }
diff --git a/octopii.py b/octopii.py
index af60499..b040ed9 100644
--- a/octopii.py
+++ b/octopii.py
@@ -196,7 +196,7 @@ def search_pii(file_path):
 
         try:
             results = search_pii (file_path)
-            print(json.dumps(results, indent=4).replace("{", "").replace("}", "").replace("    ", ""))
+            print(json.dumps(results, indent=4))
             file_utils.append_to_output_file(results, output_file)
             print ("\nOutput saved in " + output_file)