diff --git a/download_data.py b/download_data.py
index 727932a47..d7d2891c7 100644
--- a/download_data.py
+++ b/download_data.py
@@ -360,8 +360,8 @@ def generate_value(value):
     for n, i in enumerate(value):
         if base_32 and i not in "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567":
             base_32 = False
-        if '-' == i and 36 == len(value) and n in [8, 13, 18, 23]:
-            # UUID separator
+        if '-' == i and len(value) in (18, 36) and n in (8, 13, 18, 23):
+            # UUID separator or something like this
             continue
         if hex_upper and i not in "0123456789ABCDEF":
             hex_upper = False
diff --git a/meta/0436af4a.csv b/meta/0436af4a.csv
index 31ecaeabb..617356758 100644
--- a/meta/0436af4a.csv
+++ b/meta/0436af4a.csv
@@ -179,3 +179,4 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 1370689,697a0f01,GitHub,0436af4a,data/0436af4a/test/697a0f01.cs,56,56,T,F,24,60,F,F,,,,,0.0,0,F,F,F,UUID
 1370690,697a0f01,GitHub,0436af4a,data/0436af4a/test/697a0f01.cs,66,66,T,F,23,59,F,F,,,,,0.0,0,F,F,F,UUID
 1371381,6d6c3e78,GitHub,0436af4a,data/0436af4a/src/6d6c3e78.cs,151,151,F,F,35,45,F,F,,,,,0.0,0,F,F,F,Auth
+1381055,8a1f6cd5,GitHub,0436af4a,data/0436af4a/test/8a1f6cd5.cs,269,269,F,F,,,F,F,,,,,0.0,0,F,F,F,Password
diff --git a/meta/0ce78112.csv b/meta/0ce78112.csv
index c0487295d..31e1a95e6 100644
--- a/meta/0ce78112.csv
+++ b/meta/0ce78112.csv
@@ -5,9 +5,9 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 1000005,f08277bb,GitHub,0ce78112,data/0ce78112/other/f08277bb,21,21,F,F,26,32,F,F,,,,,2.15,6,F,F,F,Key
 1000006,06b6094c,GitHub,0ce78112,data/0ce78112/src/06b6094c.py,291,291,F,F,15,33,F,F,,,,,2.72,18,F,F,F,Token
 1000007,06b6094c,GitHub,0ce78112,data/0ce78112/src/06b6094c.py,292,292,F,F,19,25,F,F,,,,,2.25,6,F,F,F,Key
-1002405,ee2febb0,GitHub,0ce78112,data/0ce78112/src/ee2febb0.py,199,199,T,F,19,25,F,F,,,,,2.25,6,F,F,F,API
-1002406,ee2febb0,GitHub,0ce78112,data/0ce78112/src/ee2febb0.py,231,231,T,F,25,31,F,F,,,,,2.58,6,F,F,F,API
-1002407,ee2febb0,GitHub,0ce78112,data/0ce78112/src/ee2febb0.py,292,292,T,F,14,20,F,F,,,,,2.58,6,F,F,F,API
+1002405,ee2febb0,GitHub,0ce78112,data/0ce78112/src/ee2febb0.py,199,199,F,F,19,25,F,F,,,,,2.25,6,F,F,F,API
+1002406,ee2febb0,GitHub,0ce78112,data/0ce78112/src/ee2febb0.py,231,231,F,F,25,31,F,F,,,,,2.58,6,F,F,F,API
+1002407,ee2febb0,GitHub,0ce78112,data/0ce78112/src/ee2febb0.py,292,292,F,F,14,20,F,F,,,,,2.58,6,F,F,F,Token
 1112556,ee2febb0,GitHub,0ce78112,data/0ce78112/src/ee2febb0.py,292,292,F,F,37,43,F,F,,,,,0.0,0,F,F,F,API
 1112657,ee2febb0,GitHub,0ce78112,data/0ce78112/src/ee2febb0.py,293,293,F,F,40,46,F,F,,,,,0.0,0,F,F,F,API
-1002412,ee2febb0,GitHub,0ce78112,data/0ce78112/src/ee2febb0.py,674,674,T,F,25,31,F,F,,,,,2.58,6,F,F,F,API
+1002412,ee2febb0,GitHub,0ce78112,data/0ce78112/src/ee2febb0.py,674,674,F,F,25,31,F,F,,,,,2.58,6,F,F,F,API
diff --git a/meta/177cf0f9.csv b/meta/177cf0f9.csv
index cf45b7b10..1f46f4e6d 100644
--- a/meta/177cf0f9.csv
+++ b/meta/177cf0f9.csv
@@ -78,3 +78,4 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 1339395,c9373636,GitHub,177cf0f9,data/177cf0f9/test/c9373636.go,106,106,T,F,7,43,F,F,,,,,0.0,0,F,F,F,UUID
 1339396,c9373636,GitHub,177cf0f9,data/177cf0f9/test/c9373636.go,271,271,T,F,10,46,F,F,,,,,0.0,0,F,F,F,UUID
 1339397,c9373636,GitHub,177cf0f9,data/177cf0f9/test/c9373636.go,327,327,T,F,10,46,F,F,,,,,0.0,0,F,F,F,UUID
+1381052,c13cba72,GitHub,177cf0f9,data/177cf0f9/test/c13cba72.go,69,69,F,F,,,F,F,,,,,0.0,0,F,F,F,Key
diff --git a/meta/387016a6.csv b/meta/387016a6.csv
index f22d8d2f5..56b62a4d2 100644
--- a/meta/387016a6.csv
+++ b/meta/387016a6.csv
@@ -1056,7 +1056,7 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 130981,ce05eafb,GitHub,387016a6,data/387016a6/src/ce05eafb.java,95,95,F,F,,,F,F,,,,,0.00,,F,F,F,Password
 131704,e03d5beb,GitHub,387016a6,data/387016a6/test/e03d5beb.java,2315,2315,F,F,,,F,F,,,,,0,0,F,F,F,Gitlab Feed Token
 131705,e03d5beb,GitHub,387016a6,data/387016a6/test/e03d5beb.java,1056,1056,F,F,1,21,F,F,,,,,0,0,F,F,F,Gitlab Feed Token
-131706,e03d5beb,GitHub,387016a6,data/387016a6/test/e03d5beb.java,1073,1073,F,F,69,89,F,F,,,,,0,0,F,F,F,Gitlab Feed Token
+131706,e03d5beb,GitHub,387016a6,data/387016a6/test/e03d5beb.java,1073,1073,T,F,69,89,F,F,,,,,0,0,F,F,F,API:Key:Gitlab Feed Token
 131711,8930c0cb,GitHub,387016a6,data/387016a6/src/8930c0cb.asciidoc,135,135,F,F,6,26,F,F,,,,,0,0,F,F,F,Gitlab Feed Token
 131712,27e24e2f,GitHub,387016a6,data/387016a6/src/27e24e2f.asciidoc,79,79,F,F,6,26,F,F,,,,,0.00,,F,F,F,Gitlab Feed Token
 131713,9b92dfd3,GitHub,387016a6,data/387016a6/src/9b92dfd3.asciidoc,85,85,F,F,6,26,F,F,,,,,0.00,,F,F,F,Gitlab Feed Token
diff --git a/meta/50103f59.csv b/meta/50103f59.csv
index 4b425439e..8bf3f7775 100644
--- a/meta/50103f59.csv
+++ b/meta/50103f59.csv
@@ -3,3 +3,4 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 35812,cc1c22c7,GitHub,50103f59,data/50103f59/src/cc1c22c7.sh,17,17,T,F,19,51,F,F,Any,,,Token,3.80,32,F,F,F,Token
 130740,38186761,GitHub,50103f59,data/50103f59/src/38186761.py,28,28,F,F,,,F,F,,,,,0.00,,F,F,F,Password
 130742,38186761,GitHub,50103f59,data/50103f59/src/38186761.py,32,32,F,F,,,F,F,,,,,0.00,,F,F,F,Password
+1381053,cdbaec5f,GitHub,50103f59,data/50103f59/src/cdbaec5f.py,37,37,F,F,27,32,F,F,,,,,0.0,0,F,F,F,URL Credentials
diff --git a/meta/64c97cb8.csv b/meta/64c97cb8.csv
index bce3ad967..29acbe8d3 100644
--- a/meta/64c97cb8.csv
+++ b/meta/64c97cb8.csv
@@ -126,3 +126,5 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 1339659,f4b8acca,GitHub,64c97cb8,data/64c97cb8/test/f4b8acca.json,3693,3693,T,F,48,84,F,F,,,,,0.0,0,F,F,F,UUID
 1339660,f4b8acca,GitHub,64c97cb8,data/64c97cb8/test/f4b8acca.json,3695,3695,T,F,13,49,F,F,,,,,0.0,0,F,F,F,UUID
 1341512,602fb3c8,GitHub,64c97cb8,data/64c97cb8/src/602fb3c8.xaml,118,118,F,F,14,24,F,F,,,,,0.0,0,F,F,F,Key
+1381056,3b07a0a0,GitHub,64c97cb8,data/64c97cb8/src/3b07a0a0.cs,199,199,F,F,,,F,F,,,,,0.0,0,F,F,F,Password
+1381057,3b07a0a0,GitHub,64c97cb8,data/64c97cb8/src/3b07a0a0.cs,214,214,F,F,,,F,F,,,,,0.0,0,F,F,F,Password
diff --git a/meta/6c73b80a.csv b/meta/6c73b80a.csv
index d8e9cc948..793a0c917 100644
--- a/meta/6c73b80a.csv
+++ b/meta/6c73b80a.csv
@@ -279,7 +279,7 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 34188,edc1c568,GitHub,6c73b80a,data/6c73b80a/test/edc1c568.go,1302,1302,Template,F,33,36,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 34191,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1174,1174,T,T,33,40,F,F,Any,,,Secret,1.32,7,F,F,F,Password
 34194,69abb428,GitHub,6c73b80a,data/6c73b80a/test/69abb428.go,8884,8884,Template,F,30,33,F,F,Any,,,Secret,1.58,3,F,F,F,Password
-34195,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1163,1163,T,T,31,38,F,F,Any,,,Secret,1.32,7,F,F,F,Password
+34195,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1163,1163,T,T,31,35,F,F,Any,,,Secret,1.32,7,F,F,F,Password
 34201,f1bada03,GitHub,6c73b80a,data/6c73b80a/test/f1bada03.go,3960,3960,Template,F,29,32,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 34202,7708ebf0,GitHub,6c73b80a,data/6c73b80a/test/7708ebf0.go,5083,5083,T,T,29,39,F,F,Any,,,Secret,2.46,10,F,F,F,Password
 34203,f1bada03,GitHub,6c73b80a,data/6c73b80a/test/f1bada03.go,3957,3957,Template,F,29,32,F,F,Any,,,Secret,1.58,3,F,F,F,Password
@@ -325,23 +325,23 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 35319,598e7639,GitHub,6c73b80a,data/6c73b80a/test/598e7639.go,110,110,Template,T,29,33,F,F,CharsOnly,,,Secret,1.50,4,F,F,F,Password
 35321,edc1c568,GitHub,6c73b80a,data/6c73b80a/test/edc1c568.go,1418,1418,Template,T,20,23,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 35331,88341713,GitHub,6c73b80a,data/6c73b80a/test/88341713.go,3178,3178,Template,T,20,23,F,F,Any,,,Secret,1.58,3,F,F,F,Password
-35346,88763956,GitHub,6c73b80a,data/6c73b80a/test/88763956.go,3525,3525,T,T,27,32,F,F,Any,,,Secret,1.46,5,F,F,F,Password
-35347,88763956,GitHub,6c73b80a,data/6c73b80a/test/88763956.go,3524,3524,T,T,27,32,F,F,Any,,,Secret,1.46,5,F,F,F,Password
+35346,88763956,GitHub,6c73b80a,data/6c73b80a/test/88763956.go,3525,3525,T,T,27,31,F,F,Any,,,Secret,1.46,5,F,F,F,Password
+35347,88763956,GitHub,6c73b80a,data/6c73b80a/test/88763956.go,3524,3524,T,T,27,31,F,F,Any,,,Secret,1.46,5,F,F,F,Password
 35360,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,4286,4286,Template,F,22,25,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 35371,f1bada03,GitHub,6c73b80a,data/6c73b80a/test/f1bada03.go,3600,3600,Template,F,24,27,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 35381,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,2570,2570,T,F,22,26,F,F,Any,,,Secret,1.50,4,F,F,F,Password
 35382,633f9ac2,GitHub,6c73b80a,data/6c73b80a/test/633f9ac2.go,3515,3515,Template,F,22,25,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 35383,88341713,GitHub,6c73b80a,data/6c73b80a/test/88341713.go,3183,3183,Template,F,20,23,F,F,Any,,,Secret,1.58,3,F,F,F,Password
-35390,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,2556,2556,T,T,24,30,F,F,Any,,,Secret,1.82,6,F,F,F,Password
+35390,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,2556,2556,T,T,24,29,F,F,Any,,,Secret,1.82,6,F,F,F,Password
 35391,633f9ac2,GitHub,6c73b80a,data/6c73b80a/test/633f9ac2.go,3599,3599,Template,F,23,26,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 35392,edc1c568,GitHub,6c73b80a,data/6c73b80a/test/edc1c568.go,1316,1316,Template,F,23,26,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 35393,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,4281,4281,Template,F,22,25,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 35399,f1bada03,GitHub,6c73b80a,data/6c73b80a/test/f1bada03.go,3595,3595,Template,F,24,27,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 35403,0fd3e5cb,GitHub,6c73b80a,data/6c73b80a/test/0fd3e5cb.conf,16,16,F,F,24,34,F,F,,,,,0,0,F,F,F,Password
-35405,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,2562,2562,T,F,23,28,F,F,Any,,,Secret,1.86,5,F,F,F,Password
+35405,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,2562,2562,T,F,23,27,F,F,Any,,,Secret,1.86,5,F,F,F,Password
 35406,633f9ac2,GitHub,6c73b80a,data/6c73b80a/test/633f9ac2.go,3505,3505,Template,F,23,26,F,F,Any,,,Secret,1.58,3,F,F,F,Password
-35407,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,2568,2568,T,T,23,28,F,F,Any,,,Secret,1.46,5,F,F,F,Password
-35408,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,4291,4291,T,T,26,31,F,F,Any,,,Secret,1.46,5,F,F,F,Password
+35407,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,2568,2568,T,T,23,27,F,F,Any,,,Secret,1.46,5,F,F,F,Password
+35408,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,4291,4291,T,T,26,30,F,F,Any,,,Secret,1.46,5,F,F,F,Password
 35494,b406db25,GitHub,6c73b80a,data/6c73b80a/src/b406db25.pem,1,28,T,T,,,F,F,Any,Private,,Unknown,2.39,27,F,F,F,PEM Private Key
 35556,81102334,GitHub,6c73b80a,data/6c73b80a/src/81102334.pem,1,28,T,T,,,F,F,Any,Private,,Unknown,2.39,27,F,F,F,PEM Private Key
 35746,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,2598,2598,T,T,25,29,T,F,CharsOnly,,,Secret,1.50,4,F,F,F,URL Credentials
@@ -406,15 +406,15 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 37066,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1535,1535,T,T,39,47,F,F,Any,,,Secret,1.25,8,F,F,F,Password
 37067,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1721,1721,T,T,39,47,F,F,Any,,,Secret,1.25,8,F,F,F,Password
 37071,3f79ca86,GitHub,6c73b80a,data/6c73b80a/test/3f79ca86.go,340,340,T,F,15,21,F,F,Any,,,Unknown,2.25,6,F,F,F,Password
-37096,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1419,1419,T,T,33,40,F,F,Any,,,Secret,1.32,7,F,F,F,Password
-37097,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1488,1488,T,T,33,40,F,F,Any,,,Secret,1.32,7,F,F,F,Password
-37098,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1532,1532,T,T,33,40,F,F,Any,,,Secret,1.32,7,F,F,F,Password
-37099,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1718,1718,T,T,33,40,F,F,Any,,,Secret,1.32,7,F,F,F,Password
+37096,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1419,1419,T,T,33,37,F,F,Any,,,Secret,1.32,7,F,F,F,Password
+37097,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1488,1488,T,T,33,37,F,F,Any,,,Secret,1.32,7,F,F,F,Password
+37098,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1532,1532,T,T,33,37,F,F,Any,,,Secret,1.32,7,F,F,F,Password
+37099,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1718,1718,T,T,33,37,F,F,Any,,,Secret,1.32,7,F,F,F,Password
 37100,69abb428,GitHub,6c73b80a,data/6c73b80a/test/69abb428.go,8967,8967,Template,F,30,33,F,F,Any,,,Secret,1.58,3,F,F,F,Password
-37101,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1408,1408,T,T,31,38,F,F,Any,,,Secret,1.32,7,F,F,F,Password
-37102,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1477,1477,T,T,31,38,F,F,Any,,,Secret,1.32,7,F,F,F,Password
-37103,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1520,1520,T,T,31,38,F,F,Any,,,Secret,1.32,7,F,F,F,Password
-37104,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1707,1707,T,T,31,38,F,F,Any,,,Secret,1.32,7,F,F,F,Password
+37101,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1408,1408,T,T,31,35,F,F,Any,,,Secret,1.32,7,F,F,F,Password
+37102,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1477,1477,T,T,31,35,F,F,Any,,,Secret,1.32,7,F,F,F,Password
+37103,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1520,1520,T,T,31,35,F,F,Any,,,Secret,1.32,7,F,F,F,Password
+37104,1258dc58,GitHub,6c73b80a,data/6c73b80a/test/1258dc58.go,1707,1707,T,T,31,35,F,F,Any,,,Secret,1.32,7,F,F,F,Password
 37105,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,4499,4499,Template,F,31,34,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 37106,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,4531,4531,Template,F,31,34,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 37241,633f9ac2,GitHub,6c73b80a,data/6c73b80a/test/633f9ac2.go,2795,2795,T,T,31,35,T,F,CharsOnly,,,Secret,1.50,4,F,F,F,URL Credentials
@@ -424,12 +424,12 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 37338,dc47d09f,GitHub,6c73b80a,data/6c73b80a/test/dc47d09f.go,1859,1859,T,T,34,42,T,F,CharsOnly,,,Secret,2.75,8,F,F,F,URL Credentials
 37419,3f79ca86,GitHub,6c73b80a,data/6c73b80a/test/3f79ca86.go,320,320,T,F,37,,F,F,Any,,,Secret,2.25,6,F,F,F,Password
 1037419,3f79ca86,GitHub,6c73b80a,data/6c73b80a/test/3f79ca86.go,320,320,T,F,15,21,F,F,Any,,,Secret,2.25,6,F,F,F,Password
-37425,88763956,GitHub,6c73b80a,data/6c73b80a/test/88763956.go,3562,3562,T,T,27,32,F,F,Any,,,Secret,1.46,5,F,F,F,Password
-37426,88763956,GitHub,6c73b80a,data/6c73b80a/test/88763956.go,3561,3561,T,T,27,32,F,F,Any,,,Secret,1.46,5,F,F,F,Password
+37425,88763956,GitHub,6c73b80a,data/6c73b80a/test/88763956.go,3562,3562,T,T,27,31,F,F,Any,,,Secret,1.46,5,F,F,F,Password
+37426,88763956,GitHub,6c73b80a,data/6c73b80a/test/88763956.go,3561,3561,T,T,27,31,F,F,Any,,,Secret,1.46,5,F,F,F,Password
 37429,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,4412,4412,Template,F,22,25,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 37430,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,4434,4434,Template,F,22,25,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 37439,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,2666,2666,T,F,22,26,F,F,Any,,,Secret,1.50,4,F,F,F,Password
-37440,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,2660,2660,T,T,24,30,F,F,Any,,,Secret,1.82,6,F,F,F,Password
+37440,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,2660,2660,T,T,24,29,F,F,Any,,,Secret,1.82,6,F,F,F,Password
 37441,633f9ac2,GitHub,6c73b80a,data/6c73b80a/test/633f9ac2.go,3673,3673,Template,F,23,26,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 37442,633f9ac2,GitHub,6c73b80a,data/6c73b80a/test/633f9ac2.go,3708,3708,Template,F,23,26,F,F,Any,,,Secret,1.58,3,F,F,F,Password
 37443,edc1c568,GitHub,6c73b80a,data/6c73b80a/test/edc1c568.go,1317,1317,Template,F,23,26,F,F,Any,,,Secret,1.58,3,F,F,F,Password
@@ -618,15 +618,15 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 82075,dc47d09f,GitHub,6c73b80a,data/6c73b80a/test/dc47d09f.go,933,933,Template,F,23,26,F,F,CharsOnly,,,Secret,1.58,3,F,F,F,Password
 82076,3f79ca86,GitHub,6c73b80a,data/6c73b80a/test/3f79ca86.go,321,321,T,F,40,,F,F,Any,,,Secret,2.25,6,F,F,F,Password
 82078,35b59241,GitHub,6c73b80a,data/6c73b80a/test/35b59241.go,2249,2249,F,F,20,22,F,F,,,,,0,0,F,F,F,Password
-82079,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,913,913,F,F,16,80,F,F,NumbersOnly,,,Unknown,3.80,64,F,F,F,Bitbucket Client Secret
+82079,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,913,913,F,F,16,80,F,F,NumbersOnly,,,Unknown,3.80,64,F,F,F,Bitbucket Client Secret:Certificate
 136079,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,914,914,F,F,1,65,F,F,NumbersOnly,,,Unknown,3.80,64,F,F,F,Bitbucket Client Secret
-82080,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,924,924,F,F,16,80,F,F,NumbersOnly,,,Unknown,3.80,64,F,F,F,Bitbucket Client Secret
+82080,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,924,924,F,F,16,80,F,F,NumbersOnly,,,Unknown,3.80,64,F,F,F,Bitbucket Client Secret:Certificate
 136080,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,925,925,F,F,1,65,F,F,NumbersOnly,,,Unknown,3.80,64,F,F,F,Bitbucket Client Secret
-82081,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,936,936,F,F,16,80,F,F,NumbersOnly,,,Unknown,3.80,64,F,F,F,Bitbucket Client Secret
+82081,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,936,936,F,F,16,80,F,F,NumbersOnly,,,Unknown,3.80,64,F,F,F,Bitbucket Client Secret:Certificate
 136081,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,937,937,F,F,1,65,F,F,NumbersOnly,,,Unknown,3.80,64,F,F,F,Bitbucket Client Secret
-82082,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,947,947,F,F,16,80,F,F,NumbersOnly,,,Unknown,3.80,64,F,F,F,Bitbucket Client Secret
+82082,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,947,947,F,F,16,80,F,F,NumbersOnly,,,Unknown,3.80,64,F,F,F,Bitbucket Client Secret:Certificate
 136082,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,948,948,F,F,1,65,F,F,NumbersOnly,,,Unknown,3.80,64,F,F,F,Bitbucket Client Secret
-82083,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,958,958,F,F,16,80,F,F,NumbersOnly,,,Unknown,3.80,64,F,F,F,Bitbucket Client Secret
+82083,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,958,958,F,F,16,80,F,F,NumbersOnly,,,Unknown,3.80,64,F,F,F,Bitbucket Client Secret:Certificate
 136083,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,959,959,F,F,1,65,F,F,NumbersOnly,,,Unknown,3.80,64,F,F,F,Bitbucket Client Secret
 82084,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,1568,1568,Template,F,64,67,F,F,CharsOnly,,,Secret,1.58,3,F,F,F,Password
 82085,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,1628,1628,F,F,10,13,F,F,,,,,0,0,F,F,F,Password
@@ -805,3 +805,15 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 1041514,88763956,GitHub,6c73b80a,data/6c73b80a/test/88763956.go,768,768,T,F,48,53,F,F,,,,,0.0,0,F,F,F,URL Credentials
 1341541,3f79ca86,GitHub,6c73b80a,data/6c73b80a/test/3f79ca86.go,295,295,F,F,,,F,F,,,,,0.0,0,F,F,F,Password
 1337696,7708ebf0,GitHub,6c73b80a,data/6c73b80a/test/7708ebf0.go,7023,7023,T,F,30,66,F,F,,,,,0.0,0,F,F,F,UUID
+1381006,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,902,902,F,F,16,80,F,F,,,,,0.0,0,F,F,F,Certificate
+1381058,1a13a17c,GitHub,6c73b80a,data/6c73b80a/test/1a13a17c.go,2136,2136,T,F,7,63,F,F,,,,,0.0,0,F,F,F,Key
+1381059,1a13a17c,GitHub,6c73b80a,data/6c73b80a/test/1a13a17c.go,2142,2142,T,F,7,63,F,F,,,,,0.0,0,F,F,F,Key
+1381060,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,2749,2749,T,F,8,64,F,F,,,,,0.0,0,F,F,F,Key
+1381061,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,2755,2755,T,F,8,64,F,F,,,,,0.0,0,F,F,F,Key
+1381062,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,2837,2837,T,F,8,64,F,F,,,,,0.0,0,F,F,F,Key
+1381063,515f4ca6,GitHub,6c73b80a,data/6c73b80a/test/515f4ca6.go,2844,2844,T,F,8,64,F,F,,,,,0.0,0,F,F,F,Key
+1381064,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,2046,2046,T,F,8,64,F,F,,,,,0.0,0,F,F,F,Key
+1381065,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,2053,2053,T,F,8,64,F,F,,,,,0.0,0,F,F,F,Key
+1381066,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,2642,2642,T,F,16,72,F,F,,,,,0.0,0,F,F,F,Key
+1381067,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,2645,2645,T,F,16,72,F,F,,,,,0.0,0,F,F,F,Key
+1381068,728925ac,GitHub,6c73b80a,data/6c73b80a/test/728925ac.go,2875,2875,T,F,8,64,F,F,,,,,0.0,0,F,F,F,Key
diff --git a/meta/71455799.csv b/meta/71455799.csv
index 69a6a5f1b..6e74a45f9 100644
--- a/meta/71455799.csv
+++ b/meta/71455799.csv
@@ -30,10 +30,10 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 29274,f9312afb,GitHub,71455799,data/71455799/test/f9312afb.tf,19,19,T,F,24,33,F,F,CharsOnly,,,Secret,2.50,9,F,F,F,Password
 29275,004bbc21,GitHub,71455799,data/71455799/test/004bbc21.tf,19,19,T,F,24,33,F,F,CharsOnly,,,Secret,2.50,9,F,F,F,Password
 31371,15c8e8a5,GitHub,71455799,data/71455799/test/15c8e8a5.tf,27,27,T,T,12,28,F,F,CharsOnly,,,Unknown,3.33,16,F,F,F,Key
-32234,8d6d06be,GitHub,71455799,data/71455799/test/8d6d06be.go,79,79,T,F,25,45,F,F,Any,,AWS Client ID,Token,3.72,20,F,F,F,AWS Client ID:Gitlab Feed Token
-32236,8d6d06be,GitHub,71455799,data/71455799/test/8d6d06be.go,71,71,T,F,25,45,F,F,Any,,AWS Client ID,Token,3.82,20,F,F,F,AWS Client ID:Gitlab Feed Token
-32237,8d6d06be,GitHub,71455799,data/71455799/test/8d6d06be.go,75,75,T,F,25,45,F,F,Any,,AWS Client ID,Token,3.72,20,F,F,F,AWS Client ID:Gitlab Feed Token
-32238,8d6d06be,GitHub,71455799,data/71455799/test/8d6d06be.go,67,67,T,F,25,45,F,F,Any,,AWS Client ID,Token,3.51,20,F,F,F,AWS Client ID:Gitlab Feed Token
+32234,8d6d06be,GitHub,71455799,data/71455799/test/8d6d06be.go,79,79,T,F,25,45,F,F,Any,,AWS Client ID,Token,3.72,20,F,F,F,AWS Client ID:Gitlab Feed Token:Key
+32236,8d6d06be,GitHub,71455799,data/71455799/test/8d6d06be.go,71,71,T,F,25,45,F,F,Any,,AWS Client ID,Token,3.82,20,F,F,F,AWS Client ID:Gitlab Feed Token:Key
+32237,8d6d06be,GitHub,71455799,data/71455799/test/8d6d06be.go,75,75,T,F,25,45,F,F,Any,,AWS Client ID,Token,3.72,20,F,F,F,AWS Client ID:Gitlab Feed Token:Key
+32238,8d6d06be,GitHub,71455799,data/71455799/test/8d6d06be.go,67,67,T,F,25,45,F,F,Any,,AWS Client ID,Token,3.51,20,F,F,F,AWS Client ID:Gitlab Feed Token:Key
 32553,7ff5251e,GitHub,71455799,data/71455799/test/7ff5251e.go,1088,1088,T,F,7,27,F,F,Any,,AWS Client ID,Token,3.38,20,F,F,F,AWS Client ID:Gitlab Feed Token
 32554,7ff5251e,GitHub,71455799,data/71455799/test/7ff5251e.go,1063,1063,T,F,7,27,F,F,Any,,AWS Client ID,Token,3.72,20,F,F,F,AWS Client ID:Gitlab Feed Token
 34172,4847bee0,GitHub,71455799,data/71455799/test/4847bee0.tfstate,77,77,T,F,14,35,F,F,Any,,AWS Client ID,Token,3.92,20,F,F,F,AWS Client ID
diff --git a/meta/73ae7ce6.csv b/meta/73ae7ce6.csv
index 4b04050c7..a61dbf92a 100644
--- a/meta/73ae7ce6.csv
+++ b/meta/73ae7ce6.csv
@@ -11,3 +11,4 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 1005278,13d90538,GitHub,73ae7ce6,data/73ae7ce6/other/13d90538.md,216,216,T,F,18,78,F,F,,,,,0,0,F,F,F,Token
 1005279,29b0e54f,GitHub,73ae7ce6,data/73ae7ce6/other/29b0e54f.md,40,40,F,F,16,47,F,F,,,,,0,0,F,F,F,Key:Secret
 1005281,29b0e54f,GitHub,73ae7ce6,data/73ae7ce6/other/29b0e54f.md,45,45,F,F,25,56,F,F,,,,,0,0,F,F,F,Key:Secret:Token
+1381024,563dafbd,GitHub,73ae7ce6,data/73ae7ce6/other/563dafbd.md,15,15,F,F,16,23,F,F,,,,,0.0,0,F,F,F,Token
diff --git a/meta/7738e44d.csv b/meta/7738e44d.csv
index 162f924d4..738d6ce37 100644
--- a/meta/7738e44d.csv
+++ b/meta/7738e44d.csv
@@ -152,3 +152,38 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 1345739,f56f6d9a,GitHub,7738e44d,data/7738e44d/src/f56f6d9a.yml,329,329,T,F,2,38,F,F,,,,,0.0,0,F,F,F,UUID
 1345740,f56f6d9a,GitHub,7738e44d,data/7738e44d/src/f56f6d9a.yml,397,397,T,F,2,38,F,F,,,,,0.0,0,F,F,F,UUID
 1345741,f56f6d9a,GitHub,7738e44d,data/7738e44d/src/f56f6d9a.yml,399,399,T,F,2,38,F,F,,,,,0.0,0,F,F,F,UUID
+1381012,0795ee00,GitHub,7738e44d,data/7738e44d/src/0795ee00.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381013,249d9743,GitHub,7738e44d,data/7738e44d/src/249d9743.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381014,89daea9d,GitHub,7738e44d,data/7738e44d/src/89daea9d.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381015,97220e02,GitHub,7738e44d,data/7738e44d/src/97220e02.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381016,ad75855a,GitHub,7738e44d,data/7738e44d/src/ad75855a.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381017,b2154277,GitHub,7738e44d,data/7738e44d/src/b2154277.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381018,c01e4bfa,GitHub,7738e44d,data/7738e44d/src/c01e4bfa.yml,49,49,T,F,341,357,F,F,,,,,0.0,0,F,F,F,Token
+1381019,c067c5dc,GitHub,7738e44d,data/7738e44d/src/c067c5dc.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381020,e87443ba,GitHub,7738e44d,data/7738e44d/src/e87443ba.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381021,f7033b29,GitHub,7738e44d,data/7738e44d/src/f7033b29.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381025,01e901d4,GitHub,7738e44d,data/7738e44d/src/01e901d4.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381026,02bdd479,GitHub,7738e44d,data/7738e44d/src/02bdd479.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381027,22d06efa,GitHub,7738e44d,data/7738e44d/src/22d06efa.yml,84,84,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381028,2562818d,GitHub,7738e44d,data/7738e44d/src/2562818d.yml,49,49,T,F,341,357,F,F,,,,,0.0,0,F,F,F,Token
+1381029,649a26fe,GitHub,7738e44d,data/7738e44d/src/649a26fe.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381030,6a876f6c,GitHub,7738e44d,data/7738e44d/src/6a876f6c.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381031,838d0c32,GitHub,7738e44d,data/7738e44d/src/838d0c32.yml,84,84,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381032,8b409d1a,GitHub,7738e44d,data/7738e44d/src/8b409d1a.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381033,93d2a9d8,GitHub,7738e44d,data/7738e44d/src/93d2a9d8.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381034,9bf0a59d,GitHub,7738e44d,data/7738e44d/src/9bf0a59d.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381035,9bf0a59d,GitHub,7738e44d,data/7738e44d/src/9bf0a59d.yml,127,127,T,F,306,322,F,F,,,,,0.0,0,F,F,F,Token
+1381036,9d97cae9,GitHub,7738e44d,data/7738e44d/src/9d97cae9.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381037,9e87288f,GitHub,7738e44d,data/7738e44d/src/9e87288f.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381038,aaa77e70,GitHub,7738e44d,data/7738e44d/src/aaa77e70.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381039,bd1c188d,GitHub,7738e44d,data/7738e44d/src/bd1c188d.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381040,c4b614ca,GitHub,7738e44d,data/7738e44d/src/c4b614ca.yml,84,84,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381041,d03ce1cf,GitHub,7738e44d,data/7738e44d/src/d03ce1cf.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381042,d340e4cd,GitHub,7738e44d,data/7738e44d/src/d340e4cd.yml,110,110,T,F,273,289,F,F,,,,,0.0,0,F,F,F,Token
+1381043,f293bc63,GitHub,7738e44d,data/7738e44d/src/f293bc63.yml,41,41,T,F,305,321,F,F,,,,,0.0,0,F,F,F,Token
+1381044,f4a1a707,GitHub,7738e44d,data/7738e44d/src/f4a1a707.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381047,0816cffa,GitHub,7738e44d,data/7738e44d/src/0816cffa.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381048,2b3d329e,GitHub,7738e44d,data/7738e44d/src/2b3d329e.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381049,5011ce5c,GitHub,7738e44d,data/7738e44d/src/5011ce5c.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381050,56dad40c,GitHub,7738e44d,data/7738e44d/src/56dad40c.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
+1381051,ae38e7fc,GitHub,7738e44d,data/7738e44d/src/ae38e7fc.yml,86,86,T,F,307,323,F,F,,,,,0.0,0,F,F,F,Token
diff --git a/meta/8cda00f3.csv b/meta/8cda00f3.csv
index bf4c9e6df..df92dd60b 100644
--- a/meta/8cda00f3.csv
+++ b/meta/8cda00f3.csv
@@ -720,8 +720,8 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 107373,387aa4d0,GitHub,8cda00f3,data/8cda00f3/src/387aa4d0.c,186865,186865,F,F,,,F,F,,,,,0.00,,F,F,F,Secret
 107374,63c26c9a,GitHub,8cda00f3,data/8cda00f3/src/63c26c9a.py,33,33,Template,T,19,44,F,F,Any,,,Secret,3.49,25,F,F,F,Password
 107377,b0e56910,GitHub,8cda00f3,data/8cda00f3/src/b0e56910.py,108,108,Template,T,19,44,F,F,Any,,,Secret,3.49,25,F,F,F,Password
-107378,24e05f8d,GitHub,8cda00f3,data/8cda00f3/test/24e05f8d.go,95,95,F,F,,,F,F,,,,,0.00,,F,F,F,Bitbucket Client ID:Bitbucket Client Secret
-107379,24e05f8d,GitHub,8cda00f3,data/8cda00f3/test/24e05f8d.go,132,132,F,F,,,F,F,,,,,0.00,,F,F,F,Bitbucket Client ID:Bitbucket Client Secret
+107378,24e05f8d,GitHub,8cda00f3,data/8cda00f3/test/24e05f8d.go,95,95,F,F,,,F,F,,,,,0.00,,F,F,F,Bitbucket Client ID:Bitbucket Client Secret:Key
+107379,24e05f8d,GitHub,8cda00f3,data/8cda00f3/test/24e05f8d.go,132,132,F,F,,,F,F,,,,,0.00,,F,F,F,Bitbucket Client ID:Bitbucket Client Secret:Key
 107380,ea34b7c2,GitHub,8cda00f3,data/8cda00f3/test/ea34b7c2.go,90,90,F,F,,,F,F,,,,,0.00,,F,F,F,Secret:Key
 113959,387aa4d0,GitHub,8cda00f3,data/8cda00f3/src/387aa4d0.c,144598,144598,F,F,,,F,F,,,,,0.00,,F,F,F,Token
 113960,9b59053d,GitHub,8cda00f3,data/8cda00f3/src/9b59053d.go,24,24,F,F,,,F,F,,,,,0.00,,F,F,F,Secret
diff --git a/meta/a09d9e50.csv b/meta/a09d9e50.csv
index 029c7f81a..52006e605 100644
--- a/meta/a09d9e50.csv
+++ b/meta/a09d9e50.csv
@@ -82,7 +82,7 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 6984,054074fe,GitHub,a09d9e50,data/a09d9e50/test/054074fe.ndjson,3165,3165,F,F,,,F,F,,,,,0,0,F,F,F,Password
 6986,054074fe,GitHub,a09d9e50,data/a09d9e50/test/054074fe.ndjson,580,580,F,F,,,F,F,,,,,0,0,F,F,F,Key
 6987,054074fe,GitHub,a09d9e50,data/a09d9e50/test/054074fe.ndjson,2060,2060,F,F,,,F,F,,,,,0,0,F,F,F,Token
-6990,054074fe,GitHub,a09d9e50,data/a09d9e50/test/054074fe.ndjson,4713,4713,F,F,,,F,F,,,,,0,0,F,F,F,Token
+6990,054074fe,GitHub,a09d9e50,data/a09d9e50/test/054074fe.ndjson,4713,4713,T,F,1656,1671,F,F,,,,,0.0,0,F,F,F,Password
 6991,054074fe,GitHub,a09d9e50,data/a09d9e50/test/054074fe.ndjson,2470,2470,F,F,,,F,F,,,,,0,0,F,F,F,API:Key
 6992,054074fe,GitHub,a09d9e50,data/a09d9e50/test/054074fe.ndjson,4322,4322,F,F,,,F,F,,,,,0,0,F,F,F,Secret
 6993,054074fe,GitHub,a09d9e50,data/a09d9e50/test/054074fe.ndjson,1879,1879,F,F,,,F,F,,,,,0,0,F,F,F,Password:API:Credential
diff --git a/meta/a0cd6261.csv b/meta/a0cd6261.csv
index 0bb92c162..92f20eff7 100644
--- a/meta/a0cd6261.csv
+++ b/meta/a0cd6261.csv
@@ -268,7 +268,10 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 1338501,92025475,GitHub,a0cd6261,data/a0cd6261/other/92025475.md,152,152,F,F,11,106,F,F,,,,,0.0,0,F,F,F,JSON Web Token
 1338502,92025475,GitHub,a0cd6261,data/a0cd6261/other/92025475.md,167,167,T,F,0,139,F,F,,,,,0.0,0,F,F,F,JSON Web Token
 1338503,92025475,GitHub,a0cd6261,data/a0cd6261/other/92025475.md,266,266,F,F,0,60,F,F,,,,,0.0,0,F,F,F,JSON Web Token
-
+1381081,e8c1707a,GitHub,a0cd6261,data/a0cd6261/other/e8c1707a.md,62,62,F,F,45,51,F,F,,,,,0.0,0,F,F,F,Password
+1381082,e8c1707a,GitHub,a0cd6261,data/a0cd6261/other/e8c1707a.md,63,63,F,F,45,51,F,F,,,,,0.0,0,F,F,F,Password
+1381083,e8c1707a,GitHub,a0cd6261,data/a0cd6261/other/e8c1707a.md,64,64,F,F,45,51,F,F,,,,,0.0,0,F,F,F,Password
+1381084,e8c1707a,GitHub,a0cd6261,data/a0cd6261/other/e8c1707a.md,94,94,F,F,51,57,F,F,,,,,0.0,0,F,F,F,Password
 1340816,3b98604a,GitHub,a0cd6261,data/a0cd6261/other/3b98604a.md,1851,1851,T,F,33,69,F,F,,,,,0.0,0,F,F,F,UUID
 1340817,3b98604a,GitHub,a0cd6261,data/a0cd6261/other/3b98604a.md,1862,1862,T,F,33,69,F,F,,,,,0.0,0,F,F,F,UUID
 1340818,3b98604a,GitHub,a0cd6261,data/a0cd6261/other/3b98604a.md,2351,2351,T,F,36,72,F,F,,,,,0.0,0,F,F,F,UUID
diff --git a/meta/b081551c.csv b/meta/b081551c.csv
index 5b93b1d70..41de70905 100644
--- a/meta/b081551c.csv
+++ b/meta/b081551c.csv
@@ -64,7 +64,7 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 37721,939bdae4,GitHub,b081551c,data/b081551c/test/939bdae4.py,404,404,Template,T,15,20,F,F,CharsOnly,,,Secret,1.92,5,F,F,F,Password
 37722,939bdae4,GitHub,b081551c,data/b081551c/test/939bdae4.py,432,432,Template,T,15,20,F,F,CharsOnly,,,Secret,1.92,5,F,F,F,Password
 41714,89572d6c,GitHub,b081551c,data/b081551c/src/89572d6c.py,857,857,F,T,,,T,F,CharsOnly,,,Secret,1.50,4,F,F,F,Password:URL Credentials
-42961,c5b786f0,GitHub,b081551c,data/b081551c/src/c5b786f0.pyx,166,166,F,F,,,F,F,,,,,0,0,F,F,F,Password
+42961,c5b786f0,GitHub,b081551c,data/b081551c/src/c5b786f0.pyx,166,166,F,F,,,F,F,,,,,0,0,F,F,F,Password:Salt
 42962,c5b786f0,GitHub,b081551c,data/b081551c/src/c5b786f0.pyx,171,171,F,F,,,F,F,,,,,0,0,F,F,F,Password
 46729,939bdae4,GitHub,b081551c,data/b081551c/test/939bdae4.py,442,442,Template,F,13,19,F,F,NumbersOnly,,,Secret,1.58,6,F,F,F,Password
 46730,939bdae4,GitHub,b081551c,data/b081551c/test/939bdae4.py,453,453,Template,F,13,19,F,F,NumbersOnly,,,Secret,1.58,6,F,F,F,Password
@@ -109,3 +109,5 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 132964,939bdae4,GitHub,b081551c,data/b081551c/test/939bdae4.py,697,697,F,F,,,F,F,,,,,0,0,F,F,F,Password
 132965,939bdae4,GitHub,b081551c,data/b081551c/test/939bdae4.py,789,789,F,F,,,F,F,,,,,0,0,F,F,F,Password
 138053,939bdae4,GitHub,b081551c,data/b081551c/test/939bdae4.py,894,894,F,F,42,46,F,F,,,,,0.0,0,F,F,F,Password
+1381069,939bdae4,GitHub,b081551c,data/b081551c/test/939bdae4.py,793,793,F,F,42,46,F,F,,,,,0.0,0,F,F,F,Password
+1381085,c5b786f0,GitHub,b081551c,data/b081551c/src/c5b786f0.pyx,159,159,F,F,,,F,F,,,,,0.0,0,F,F,F,Nonce
diff --git a/meta/b74193f1.csv b/meta/b74193f1.csv
index c3574dbc3..a61417957 100644
--- a/meta/b74193f1.csv
+++ b/meta/b74193f1.csv
@@ -49,8 +49,8 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 35239,08b8e35f,GitHub,b74193f1,data/b74193f1/test/08b8e35f.toml,1,1,T,F,10,46,F,F,Any,,,Secret,4.65,36,F,F,F,Secret
 35240,78eb5784,GitHub,b74193f1,data/b74193f1/test/78eb5784.toml,21,21,T,F,10,88,F,F,Any,,,Secret,3.64,78,F,F,F,Secret
 35241,b3356305,GitHub,b74193f1,data/b74193f1/other/b3356305.md,247,247,T,F,10,64,F,F,Any,,,Secret,3.66,54,F,F,F,Secret
-37407,d54544b0,GitHub,b74193f1,data/b74193f1/test/d54544b0.go,54,54,T,T,35,67,F,F,Any,,,Secret,3.48,32,F,F,F,Bitbucket Client ID:Bitbucket Client Secret
-37408,d54544b0,GitHub,b74193f1,data/b74193f1/test/d54544b0.go,66,66,T,T,35,67,F,F,Any,,,Secret,3.48,32,F,F,F,Bitbucket Client ID:Bitbucket Client Secret
+37407,d54544b0,GitHub,b74193f1,data/b74193f1/test/d54544b0.go,54,54,T,T,35,67,F,F,Any,,,Secret,3.48,32,F,F,F,Bitbucket Client ID:Bitbucket Client Secret:Secret
+37408,d54544b0,GitHub,b74193f1,data/b74193f1/test/d54544b0.go,66,66,T,T,35,67,F,F,Any,,,Secret,3.48,32,F,F,F,Bitbucket Client ID:Bitbucket Client Secret:Secret
 46170,d54544b0,GitHub,b74193f1,data/b74193f1/test/d54544b0.go,81,81,F,F,,,F,F,,,,,0,0,F,F,F,Bitbucket Client ID
 46171,d54544b0,GitHub,b74193f1,data/b74193f1/test/d54544b0.go,82,82,F,F,,,F,F,,,,,0,0,F,F,F,Secret
 46172,d54544b0,GitHub,b74193f1,data/b74193f1/test/d54544b0.go,86,86,F,F,,,F,F,,,,,0,0,F,F,F,Secret
diff --git a/meta/b82c1b9d.csv b/meta/b82c1b9d.csv
index 62b10b797..0b7b3c902 100644
--- a/meta/b82c1b9d.csv
+++ b/meta/b82c1b9d.csv
@@ -15,7 +15,7 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 29965,4eec45b6,GitHub,b82c1b9d,data/b82c1b9d/src/4eec45b6.go,161,161,Template,T,10,24,F,F,Any,,,Secret,3.25,14,F,F,F,Secret
 32382,2eec2e84,GitHub,b82c1b9d,data/b82c1b9d/src/2eec2e84.go,102,102,F,F,18,26,F,F,,,,,0,0,F,F,F,Password
 32395,c20c4520,GitHub,b82c1b9d,data/b82c1b9d/src/c20c4520.go,35,35,F,F,127,198,F,F,,,,,0,0,F,F,F,Secret
-33714,2950491b,GitHub,b82c1b9d,data/b82c1b9d/src/2950491b.go,59,59,T,T,14,23,F,F,Any,,,Secret,2.60,9,F,F,F,Password
+33714,2950491b,GitHub,b82c1b9d,data/b82c1b9d/src/2950491b.go,59,59,T,T,14,22,F,F,Any,,,Secret,2.60,9,F,F,F,Password
 33911,e994c878,GitHub,b82c1b9d,data/b82c1b9d/src/e994c878.tmpl,25,25,Template,T,22,26,F,F,CharsOnly,,,Secret,1.50,4,F,F,F,Password
 36260,d5d706cd,GitHub,b82c1b9d,data/b82c1b9d/src/d5d706cd.tmpl,36,36,F,F,5,17,F,F,,,,,0,0,F,F,F,Secret
 80166,2fc06eaa,GitHub,b82c1b9d,data/b82c1b9d/test/2fc06eaa.go,22,22,F,F,66,73,F,F,,,,,0,0,F,F,F,Secret
diff --git a/meta/d2d68c6f.csv b/meta/d2d68c6f.csv
index 2e26e7719..6d3614186 100644
--- a/meta/d2d68c6f.csv
+++ b/meta/d2d68c6f.csv
@@ -835,4 +835,5 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 1001995,94a92fdb,GitHub,d2d68c6f,data/d2d68c6f/test/94a92fdb.m,160,160,F,F,,,F,F,,,,,0,0,F,F,F,Password
 1340855,1abda32f,GitHub,d2d68c6f,data/d2d68c6f/test/1abda32f.backup,5,5,T,F,12,48,F,F,,,,,0.0,0,F,F,F,UUID
 1340856,85d2c1e2,GitHub,d2d68c6f,data/d2d68c6f/test/85d2c1e2.fsproj,8,8,T,F,13,49,F,F,,,,,0.0,0,F,F,F,UUID
-
+1381045,d9508d54,GitHub,d2d68c6f,data/d2d68c6f/test/d9508d54.m,945,945,F,F,,,F,F,,,,,0.0,0,F,F,F,Token
+1381046,d9508d54,GitHub,d2d68c6f,data/d2d68c6f/test/d9508d54.m,1070,1070,F,F,,,F,F,,,,,0.0,0,F,F,F,Token
diff --git a/meta/d2d6eedc.csv b/meta/d2d6eedc.csv
index ec71877d5..20e404b92 100644
--- a/meta/d2d6eedc.csv
+++ b/meta/d2d6eedc.csv
@@ -21,3 +21,5 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 108707,ec94cf7a,GitHub,d2d6eedc,data/d2d6eedc/test/ec94cf7a.go,88,88,T,F,125,147,F,F,Any,,,Secret,3.24,22,F,F,T,Password
 100006,ec94cf7a,GitHub,d2d6eedc,data/d2d6eedc/test/ec94cf7a.go,88,88,T,F,180,202,T,F,Any,,,Secret,3.24,22,F,F,T,Password
 1340857,ec94cf7a,GitHub,d2d6eedc,data/d2d6eedc/test/ec94cf7a.go,245,245,T,F,18,54,F,F,,,,,0.0,0,F,F,F,UUID
+1381071,ec94cf7a,GitHub,d2d6eedc,data/d2d6eedc/test/ec94cf7a.go,247,247,F,F,,,F,F,,,,,0.0,0,F,F,F,API
+1381089,34bebe8c,GitHub,d2d6eedc,data/d2d6eedc/src/34bebe8c.go,30,30,F,F,,,F,F,,,,,0.0,0,F,F,F,Secret
diff --git a/meta/f710ac3c.csv b/meta/f710ac3c.csv
index d61b8e7fd..a72c20e76 100644
--- a/meta/f710ac3c.csv
+++ b/meta/f710ac3c.csv
@@ -769,3 +769,4 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 138142,255cd676,GitHub,f710ac3c,data/f710ac3c/test/255cd676.py,335,335,T,F,86,98,F,F,,,,,0.0,0,F,F,F,Password
 138143,255cd676,GitHub,f710ac3c,data/f710ac3c/test/255cd676.py,344,344,T,F,86,98,F,F,,,,,0.0,0,F,F,F,Password
 138144,255cd676,GitHub,f710ac3c,data/f710ac3c/test/255cd676.py,1259,1259,T,F,63,72,F,F,,,,,0.0,0,F,F,F,Password
+1381022,57d9651a,GitHub,f710ac3c,data/f710ac3c/test/57d9651a.py,1474,1474,T,F,12,30,F,F,,,,,0.0,0,F,F,F,Token
diff --git a/meta/fec1969a.csv b/meta/fec1969a.csv
index eccb1b8de..df912616b 100644
--- a/meta/fec1969a.csv
+++ b/meta/fec1969a.csv
@@ -71,3 +71,4 @@ Id,FileID,Domain,RepoName,FilePath,LineStart,LineEnd,GroundTruth,WithWords,Value
 134775,23d1d221,GitHub,fec1969a,data/fec1969a/src/23d1d221.js,253,253,F,F,,,F,F,,,,,0,0,F,F,F,Secret:Key
 134776,23d1d221,GitHub,fec1969a,data/fec1969a/src/23d1d221.js,287,287,F,F,,,F,F,,,,,0,0,F,F,F,Secret:Key
 134777,23d1d221,GitHub,fec1969a,data/fec1969a/src/23d1d221.js,291,291,F,F,,,F,F,,,,,0,0,F,F,F,Secret:Key
+1381054,b15a1989,GitHub,fec1969a,data/fec1969a/test/b15a1989.js,290,290,F,F,,,F,F,,,,,0.0,0,F,F,F,Auth