diff --git a/CVE-2017-16995/.out-of-tree.toml b/CVE-2017-16995/.out-of-tree.toml
index 9cbf98d..6f0eeac 100644
--- a/CVE-2017-16995/.out-of-tree.toml
+++ b/CVE-2017-16995/.out-of-tree.toml
@@ -4,28 +4,44 @@ type = "exploit"
 [[supported_kernels]]
 distro_type = "Ubuntu"
 distro_release = "16.04"
-release_mask = "4.4.0-(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100|101|102|103|104|105|106|107|108|109|110|111|112|113|114|115|116)-.*"
+[supported_kernels.kernel]
+version = [ 4 ]
+major = [ 4 ]
+minor = [ 0 ]
+patch = [ 1, 116 ]
 
 [[supported_kernels]]
 distro_type = "Ubuntu"
 distro_release = "16.04"
-release_mask = "4.8.0-(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58)-.*"
-
-[[supported_kernels]]
-# Can be Ubuntu/CentOS/Debian/etc.
-distro_type = "Ubuntu"
-distro_release = "16.04"
-# regex for `uname -r`
-# See also: regex-golang.appspot.com
-# stupid way to generate: $ echo '4.4.0-('$(seq 44 | xargs echo | sed 's/ /|/g')')-.*'
-release_mask = "4.10.0-(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42)-.*"
+[supported_kernels.kernel]
+version = [ 4 ]
+major = [ 8 ]
+minor = [ 0 ]
+patch = [ 1, 58 ]
 
 [[supported_kernels]]
 distro_type = "Ubuntu"
 distro_release = "16.04"
-release_mask = "4.11.0-(1|2|3|4|5|6|7|8|9|10|11|12|13|14)-.*"
+[supported_kernels.kernel]
+version = [ 4 ]
+major = [ 10 ]
+minor = [ 0 ]
+patch = [ 1, 42 ]
 
 [[supported_kernels]]
 distro_type = "Ubuntu"
 distro_release = "16.04"
-release_mask = "4.13.0-(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21)-.*"
+[supported_kernels.kernel]
+version = [ 4 ]
+major = [ 11 ]
+minor = [ 0 ]
+patch = [ 1, 14 ]
+
+[[supported_kernels]]
+distro_type = "Ubuntu"
+distro_release = "16.04"
+[supported_kernels.kernel]
+version = [ 4 ]
+major = [ 13 ]
+minor = [ 0 ]
+patch = [ 1, 21 ]