diff --git a/.gitignore b/.gitignore
index 1b846e1..56bf08f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@ src/build/
 .vscode
 todo
 src/main/java/com/cys4/sensitivediscoverer/tests
+/tests
diff --git a/src/main/resources/regexes/regex_general.jsonc b/src/main/resources/regexes/regex_general.jsonc
index 927a841..634caca 100644
--- a/src/main/resources/regexes/regex_general.jsonc
+++ b/src/main/resources/regexes/regex_general.jsonc
@@ -28,18 +28,6 @@
       "{'my_super_secret' : 'ABCDEFGH-12'}"
     ]
   },
-//  {
-//    // Try to match only IPs and not section numbers of js libraries
-//    "active": true,
-//    "description": "IP Address",
-//    "regex": "(?<![\\.\\da-zA-Z%\\-])(?<!\\/\\s{0,8})((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(?![\\.\\da-zA-Z\\-])",
-//    "tests":[
-//      "0.0.0.0",
-//      "10.255.255.255",
-//      "127.0.0.1",
-//      "192.168.0.254/24"
-//    ]
-//  },
   {
     "active": true,
     "description": "Environment configuration file",
@@ -48,5 +36,49 @@
       "{\"env_file\":\"../.env\"}",
       "production.env"
     ]
+  },
+  {
+      "active": true,
+      "description": "Private IPv4 address",
+      "regex": "1(0(\\.[0-2]\\d{0,2}){3}|27(\\.[0-2]\\d{0,2}){3}|92\\.168(\\.[0-2]\\d{0,2}){2}|72\\.(1[6-9]|2\\d|3[0-2])(\\.[0-2]\\d{0,2}){2})(?![\\d.])",
+      "urls": [
+        "https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml"
+      ],
+      "tests": [
+        "127.0.0.1",
+        "127.255.255.254",
+        "10.0.0.1",
+        "10.255.255.254",
+        "172.16.0.1",
+        "172.32.255.254",
+        "192.168.0.1",
+        "192.168.255.254",
+        "10.1.10.100",
+        "10.2.20.200",
+        "!172.33.0.1",
+        "!172.15.0.1",
+        "!10.0.0.1.1",
+        "!10.255.255.2550",
+        "!10.999.999.999"
+      ]
+  },
+  {
+    "active": true,
+    "description": "Email",
+    "regex": "[a-zA-Z0-9]@[a-zA-Z0-9\\-\\.]{3,128}\\.[a-zA-Z0-9]{2,32}(?![\\w\\\\])",
+    "refinerRegex": "[\\w\\-\\.+]{1,128}$",
+    "urls": [
+      "https://learn.microsoft.com/en-us/exchange/recipients-in-exchange-online/plus-addressing-in-exchange-online"
+    ],
+    "tests": [
+      "username@domain.com",
+      "user-nam_e@domain.com",
+      "user-nam_e+user-nam_e@domain.com",
+      "sean+newsletter@contoso.com",
+      "test2+x@a.b.s23",
+      "1@domain.mail",
+      "!username@domain.com\\",
+      "!@domain.com"
+    ]
   }
 ]
\ No newline at end of file
diff --git a/src/main/resources/regexes/regex_token.jsonc b/src/main/resources/regexes/regex_token.jsonc
index bda4677..31881d7 100644
--- a/src/main/resources/regexes/regex_token.jsonc
+++ b/src/main/resources/regexes/regex_token.jsonc
@@ -15,25 +15,42 @@
     AROA    | Role
     ASCA    | Certificate
     ASIA    | Temporary (AWS STS) access key IDs use this prefix, but are unique only in combination with the secret access key and the session token.
+    //TODO find sources on keys starting with "A3T[A-Z0-9]"
     */
     "active": true,
     "description": "AWS Access Key ID",
-    //TODO length should be {16}, but some examples have {17}
-    //TODO what is A3T. ?
-    "regex": "(?i)(A3T[A-Z0-9]|ABIA|ACCA|AGPA|AIDA|AIPA|AKIA|ANPA|ANVA|APKA|AROA|ASCA|ASIA)[a-zA-Z0-9]{14,20}(?![a-zA-Z0-9+/=])",
+    "regex": "A(BIA|CCA|GPA|I(DA|PA)|KIA|N(PA|VA)|PKA|ROA|S(CA|IA))[a-zA-Z0-9]{16,17}(?![a-zA-Z0-9+/=])",
     "tests": [
+      // check all prefixes
+      "ABIA000000000EXAMPLE",
+      "ACCA000000000EXAMPLE",
+      "AGPA000000000EXAMPLE",
+      "AIDA000000000EXAMPLE",
+      "AIPA000000000EXAMPLE",
+      "AKIA000000000EXAMPLE",
+      "ANPA000000000EXAMPLE",
+      "ANVA000000000EXAMPLE",
+      "APKA000000000EXAMPLE",
+      "AROA000000000EXAMPLE",
+      "ASCA000000000EXAMPLE",
+      "ASIA000000000EXAMPLE",
+      // key samples with different lengths
       "AKIAIOSFODNN7EXAMPLE",
       "ASIAIOSFODNN7EXAMPLE",
       "AIDACKCEVSQ6C2EXAMPLE",
       "AROADBQP57FF2AEXAMPLE",
       "AIDAJQABLZS4A3QDU576Q",
       "AKIAIU5C4FEZYEXAMPLE",
-      "AKIA2EKLCMMJCE6KTO42"
+      "AKIA2EKLCMMJCE6KTO42",
+      // check false positives
+      "\"AKIAIOSFODNN7EXAMPLE\"",
+      "!AKIAIOSFODNN7EXAMPLE="
     ],
     "urls": [
-      "https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html",
+      "https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html", // token length 16-17
       "https://docs.aws.amazon.com/IAM/latest/UserGuide/security-creds.html",
-      "https://docs.gitguardian.com/secrets-detection/secrets-detection-engine/detectors/specifics/aws_ses_keys"
+      "https://docs.gitguardian.com/secrets-detection/secrets-detection-engine/detectors/specifics/aws_ses_keys",
+      "https://docs.aws.amazon.com/STS/latest/APIReference/API_GetAccessKeyInfo.html" // AKIA tokens
     ]
   },
   {
@@ -63,24 +80,6 @@
       "https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/eu/amazon-pay-automatic/add-address-and-wallet-widgets.html"
     ]
   },
-  //todo
-  //  {
-  //    // Do not match "https://facebook.com" or fa-facebook
-  //    "active": true,
-  //    "description": "Facebook Secret",
-  //    "regex": "(?i)(?<!https://)(?<!fa-)(facebook)([^;,]{0,32}?)['\\\"][\\w\\d]{10,}?['\\\"]",
-  //    "tests": [
-  //      "!fa-facebook",
-  //      "!https://facebook.com"
-  //    ]
-  //  },
-  //todo
-  //  {
-  //    "active": true,
-  //    "description": "Facebook Page Access Token",
-  //    "urls": ["https://developers.facebook.com/docs/facebook-login/guides/access-tokens"],
-  //    "regex": "(EAACEdE\\w+|EAA\\w+)"
-  //  },
   {
     "active": true,
     "description": "Google API Key",
@@ -112,7 +111,8 @@
   {
     "active": true,
     "description": "Google OAuth Client ID",
-    "regex": "\\d{1,20}-\\w{32}\\.apps\\.googleusercontent\\.com",
+    "regex": "\\.apps\\.googleusercontent\\.com",
+    "refinerRegex": "\\d{1,20}-\\w{32}$",
     "tests": [
       "462858740426-tkpv8n03opijg7erd3s9ccued2pfllsd.apps.googleusercontent.com",
       "332292536747-zbepioq1127w4lv5r6dbbddd0jdbdchl.apps.googleusercontent.com",
@@ -136,29 +136,18 @@
       "https://docs.gitguardian.com/secrets-detection/secrets-detection-engine/detectors/specifics/google_oauth2_keys"
     ]
   },
-  //todo
-  //  {
-  //    "active": true,
-  //    "description": "LinkedIn Secret Key",
-  //    "regex": "(?i)linkedin([^;]{0,32}?)['\"][0-9a-zA-Z]{16}['\"]"
-  //  },
-  //todo
-  //  {
-  //    "active": true,
-  //    "description": "LinkedIn Client ID (API Key)",
-  //    "regex": "(?i)linkedin([^;]{0,32}?)(?-i)['\"][0-9a-z]{14}['\"]"
-  //  },
-  {
-    "active": true,
-    "description": "MailChimp API Key",
-    "regex": "[0-9a-f]{32}-us[0-9]{1,2}(?!\\d)",
-    "tests": [
-      "ae54fcc23ade65fa404a65e78c56f898-us1"
-    ],
-    "urls": [
-      "https://docs.gitguardian.com/secrets-detection/secrets-detection-engine/detectors/specifics/mailchimp_api_key"
-    ]
-  },
+//  {
+//    //todo: improve regex, now it's too slow with the initial "[0-9a-f]{32}",
+//    "active": false,
+//    "description": "MailChimp API Key",
+//    "regex": "[0-9a-f]{32}-us[0-9]{1,2}(?!\\d)",
+//    "tests": [
+//      "ae54fcc23ade65fa404a65e78c56f898-us1"
+//    ],
+//    "urls": [
+//      "https://docs.gitguardian.com/secrets-detection/secrets-detection-engine/detectors/specifics/mailchimp_api_key"
+//    ]
+//  },
   {
     "active": true,
     "description": "MailGun API Key",
@@ -183,18 +172,6 @@
       "https://docs.gitguardian.com/secrets-detection/secrets-detection-engine/detectors/specifics/nuget_api_key"
     ]
   },
-  //todo
-//  {
-//    "active": true,
-//    "description": "Braintree SDK Token",
-//    "regex": "(production|sandbox)_[a-z0-9]{8}_[a-z0-9]{16}",
-//    "tests": [
-//      "production_696htvk3y5xcfnsn_42cde001d7a240d98ded578b4c1321c9"
-//    ],
-//    "urls": [
-//      ""
-//    ]
-//  },
   {
     /*
     SG.ID.VALUE
@@ -225,7 +202,8 @@
     */
     "active": true,
     "description": "Slack Token",
-    "regex": "(xoxe\\.)?(xox[psboare]|xapp)(-[a-zA-Z0-9]{1,64}){1,5}",
+    "regex": "x(ox[psboare]|app)(-[a-zA-Z0-9]{1,64}){1,5}",
+    "refinerRegex": "xoxe\\.$",
     "urls": [
       "https://api.slack.com/authentication/token-types",
       "https://learn.microsoft.com/en-us/purview/sit-defn-slack-access-token",
@@ -274,25 +252,6 @@
       "sq0idp-Y7WFLOjXXp00XXXp00_0_A"
     ]
   },
-//  {
-//    "active": true,
-//    "description": "Square Auth Token",
-//    "regex": "(?<![a-zA-Z0-9\/+])EAAA[a-zA-Z0-9\\-_]{60}",
-//    "urls": [
-//      "https://developer.squareup.com/docs/build-basics/access-tokens"
-//    ],
-//    "tests": [
-//      "EAAAEB0XZqkuXAPRKhusNNaHhrZUsZNKw_ay92e-kmhYSDrKo73FgPX9RsrFr3Fg",
-//      "!RandomEAAAEB0XZqkuXAPRKhusNNaHhrZUsZNKw_ay92e-kmhYSDrKo73FgPX9RsrFr3Fg",
-//      "!/EAAAEB0XZqkuXAPRKhusNNaHhrZUsZNKw_ay92e-kmhYSDrKo73FgPX9RsrFr3Fg",
-//      "!+EAAAEB0XZqkuXAPRKhusNNaHhrZUsZNKw_ay92e-kmhYSDrKo73FgPX9RsrFr3Fg"
-//    ]
-//  },
-  //    {
-  //      "active": true,
-  //      "description": "StackHawk API Key",
-  //      "regex": "hawk(\\.[\\w\\-]{20})+"
-  //    },
   {
     "active": true,
     "description": "Stripe API Secret Key",
@@ -325,7 +284,7 @@
   {
     "active": true,
     "description": "Twilio Account SID",
-    "regex": "SK[0-9a-zA-Z]{32}(?![a-zA-Z0-9+/=])",
+    "regex": "SK[0-9a-zA-Z]{32}(?![a-zA-Z0-9+/=?_%)])",
     "urls": [
       "https://www.twilio.com/docs/iam/api-keys/api-key",
       "https://www.twilio.com/docs/glossary/what-is-a-sid"
@@ -334,26 +293,6 @@
       "SKa3aiydsctvbbgam9tpp75jsduidvwi9t"
     ]
   },
-  //todo
-  //  {
-  //    "active": true,
-  //    "description": "Twitter Access Token",
-  //    "regex": "(?i)twitter([^;,]{0,32}?)['\"]\\d+\\-[0-9a-zA-Z]{40}['\"]",
-  //    // oauth_token=
-  //    "urls": [
-  //      "https://developer.twitter.com/en/docs/authentication/oauth-1-0a/obtaining-user-access-tokens"
-  //    ]
-  //  },
-  //todo
-  //  {
-  //    "active": true,
-  //    "description": "Twitter Secret Key",
-  //    "regex": "(?i)twitter([^;,]{0,32}?)['\"][0-9a-zA-Z]{35,44}['\"]",
-  //    // oauth_token_secret=
-  //    "urls": [
-  //      "https://developer.twitter.com/en/docs/authentication/oauth-1-0a/obtaining-user-access-tokens"
-  //    ]
-  //  },
   {
     /*
     Token type                                                      | Prefix
@@ -392,5 +331,17 @@
     "tests": [
       "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"
     ]
+  },
+  {
+    "active": true,
+    "description": "OpenAI API Key",
+    "regex": "sk-[a-zA-Z0-9]{40,128}(?![\\w\\-])",
+    "urls": [
+      "https://docs.gitguardian.com/secrets-detection/secrets-detection-engine/detectors/specifics/openai_apikey"
+    ],
+    "tests": [
+      "sk-4dF6gH8jK9lM0nO1pQ2rS4tU6vW8xY0zA2C3E4G5I6J7K8L9M",
+      "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"
+    ]
   }
 ]
diff --git a/src/main/resources/regexes/regex_url.jsonc b/src/main/resources/regexes/regex_url.jsonc
index 6d0072d..b409820 100644
--- a/src/main/resources/regexes/regex_url.jsonc
+++ b/src/main/resources/regexes/regex_url.jsonc
@@ -22,27 +22,110 @@
   },
   {
     "active": true,
-    "description": "Outlook Teams 1",
-    "regex": "outlook\\.office\\.com/webhook/[\\w\\-]+",
+    "description": "Microsoft Teams/Office 365 Connector - webhook",
+    "regex": "outlook\\.office(365)?\\.com/webhook/[\\w\\-@]{1,128}",
+    "urls": [
+      "https://docs.gitguardian.com/secrets-detection/secrets-detection-engine/detectors/specifics/outlook_team_webhook"
+    ],
+    "tests": [
+      "https://outlook.office.com/webhook/5348781d-52a8-490f-b75b-a720702114d1@b662313f-14fc-43a3-9a7a-d0e27f4f3470/IncomingWebhook/f280f53c0d244ebdba7fea00035f35df/eff4cd50-1bb8-4899-94de-795f65600a18",
+      "https://outlook.office365.com/webhook/01234567-abcd-4444-abcd-1234567890ab@98765432-dddd-5555-8888-777777777777/IncomingWebhook/1234567890abcdefedcba09876544321/ffffffff-3333-4444-5555-bbbbbbbbbbbb"
+    ]
+  },
+  {
+    "active": true,
+    "description": "Microsoft Teams - Incoming webhook",
+    "regex": "\\.webhook\\.office\\.com",
+    "refinerRegex": "\\w+$",
+    "urls": [
+      "https://learn.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/add-incoming-webhook",
+      "https://docs.gitguardian.com/secrets-detection/secrets-detection-engine/detectors/specifics/outlook_team_webhook"
+    ],
+    "tests": [
+      "https://example.webhook.office.com/webhookb2/325b9962-d380-4003-9fe3-a1c246cbafa4@7f28634d-dced-4d04-bc25-b8373a972720/appId/fd92f39d3f37573e2ba95a3df72dcdb2/b5cb79af-3d26-4a56-9d17-52d1b5cd78d7",
+      "https://fabulousinc.webhook.office.com/webhookb2/6ee4efaa-986e-4b8e-8d6b-ccf77c29e0b0@87ba1f9a-44cd-43a6-b008-6fdb45a5204e/TravisCI/9ad1eb07cda7411db33e74c3d676774e/0ad415e3-d66a-425c-9914-e9e52f2b81e1"
+    ]
+  },
+  {
+    "active": true,
+    "description": "Firebase database URL",
+    "regex": "\\.(firebase(io\\.com|database\\.app))",
+    "refinerRegex": "[0-9a-zA-Z\\.\\-]{1,64}$",
+    "urls": [
+      "https://firebase.google.com/docs/database/web/start#create_a_database",
+      "https://firebase.google.com/docs/projects/locations#rtdb-locations"
+    ],
+    "tests": [
+      "example.us-central1.firebasedatabase.app",
+      "example.europe-west1.firebasedatabase.app",
+      "example.asia-southeast1.firebasedatabase.app",
+      "Example1.firebaseio.com"
+    ]
+  },
+  {
+    "active": true,
+    "description": "AWS S3 Bucket",
+    "regex": "s3(\\.dualstack|-acce(lerate|sspoint))?\\.([a-z]{1,8}-[a-z]{1,16}-\\d{1,3}\\.)?amazonaws\\.com",
+    "refinerRegex": "[a-z\\d\\-]{3,63}\\.$",
+    "urls": [
+      "https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html",
+      "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html"
+    ],
+    "tests": [
+      "https://huge-logistics-website.s3.amazonaws.com/static/index.html",
+      "https://huge-logistics-dashboard.s3.eu-north-1.amazonaws.com/static/js/api.js",
+      "https://huge-logistics-media.s3.dualstack.us-west-1.amazonaws.com/customers.m4v",
+      "https://huge-logistics-media.s3-accelerate.us-west-1.amazonaws.com/customers.m4v",
+      "https://huge-logistics-media.s3-accesspoint.us-west-1.amazonaws.com/customers.m4v"
+    ]
+  },
+  {
+    "active": true,
+    "description": "Azure Blob Storage",
+    "regex": "blob\\.core\\.windows\\.net",
+    "refinerRegex": "[a-z\\d\\-]{3,63}\\.$",
+    "urls": [
+      "https://learn.microsoft.com/en-us/rest/api/storageservices/naming-and-referencing-containers--blobs--and-metadata#resource-uri-syntax"
+    ],
+    "tests": [
+      "https://myaccount.blob.core.windows.net/myblob"
+    ]
+  },
+  {
+    "active": true,
+    "description": "Google Cloud Storage",
+    "regex": "gs://[a-z\\d\\-]{3,63}",
+    "urls": [
+      "https://cloud.google.com/storage/docs/request-endpoints"
+    ],
+    "tests": [
+      "gs://te2t-bucket/example-maps/london.jpg",
+      "gs://test/test"
+    ]
+  },
+  {
+    "active": true,
+    "description": "Amazon ARN",
+    "regex": "arn:aws(-(cn|us-gov|iso-[bcd]))?:[\\w/.\\-]{1,63}:([\\w/.\\-]{0,63}:){2}([\\w:/.\\-]{0,1023})",
+    "urls": [
+      "https://docs.aws.amazon.com/license-manager/latest/APIReference/API_CreateToken.html",
+      "https://docs.aws.amazon.com/IAM/latest/UserGuide/reference-arns.html",
+      "https://docs.aws.amazon.com/clouddirectory/latest/APIReference/arns.html"
+    ],
     "tests": [
-      "https://outlook.office.com/webhook/5348781d-52a8-490f-b75b-a720702114d1@b662313f-14fc-43a3-9a7a-d0e27f4f3470/IncomingWebhook/f280f53c0d244ebdba7fea00035f35df/eff4cd50-1bb8-4899-94de-795f65600a18"
+      "arn:aws:iam::123456789012:user/Development/product_1234/*",
+      "arn:aws:iam:us-west-2:12345678910:directory/ARIqk1HD-UjdtmcIrJHEvPI",
+      "arn:aws:clouddirectory:us-west-2:12345678910:directory/ARIqk1HD-UjdtmcIrJHEvPI",
+      "arn:aws:service:region:account-id:resource-id",
+      "arn:aws:service:region:account-id:resource-type/resource-id",
+      "arn:aws:service:region:account-id:resource-type:resource-id",
+      "arn:aws:service:::resource-type:resource-id",
+      "arn:aws:iam:::user/Development/product_1234/*",
+      "arn:aws-cn:iam:us-west-2:12345678910:directory/ARIqk1HD-UjdtmcIrJHEvPI",
+      "arn:aws-us-gov:iam:us-west-2:12345678910:directory/ARIqk1HD-UjdtmcIrJHEvPI",
+      "arn:aws-iso-b:iam:us-west-2:12345678910:directory/ARIqk1HD-UjdtmcIrJHEvPI",
+      "arn:aws-iso-c:iam:us-west-2:12345678910:directory/ARIqk1HD-UjdtmcIrJHEvPI",
+      "arn:aws-iso-d:iam:us-west-2:12345678910:directory/ARIqk1HD-UjdtmcIrJHEvPI"
     ]
   }
-//  {
-//    "active": true,
-//    "description": "Outlook Teams 2",
-//    "regex": "\\w+\\.webhook\\.office\\.com",
-//    "tests": [
-//      "https://example.webhook.office.com/webhookb2/325b9962-d380-4003-9fe3-a1c246cbafa4@7f28634d-dced-4d04-bc25-b8373a972720/appId/fd92f39d3f37573e2ba95a3df72dcdb2/b5cb79af-3d26-4a56-9d17-52d1b5cd78d7"
-//    ]
-//  },
-//  {
-//    "active": true,
-//    "description": "Firebase database URL",
-//    "regex": "[0-9a-zA-Z\\.\\-]{0,16}\\.(firebaseio\\.com|firebasedatabase\\.app)",
-//    "tests": [
-//      "example.europe-west1.firebasedatabase.app",
-//      "Example1.firebaseio.com"
-//    ]
-//  }
 ]
\ No newline at end of file