diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d3cafd8..7a7e7c7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v6.0.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -12,6 +12,6 @@ repos:
       - id: trailing-whitespace
       - id: check-yaml
   - repo: https://git.garrity.co/garrity-software/gs-pre-commit-scala
-    rev: v1.0.1
+    rev: v1.0.2
     hooks:
       - id: scalafmt
diff --git a/.scalafmt.conf b/.scalafmt.conf
index 1d45dca..77904e4 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,5 +1,5 @@
 // See: https://github.com/scalameta/scalafmt/tags for the latest tags.
-version = 3.10.2
+version = 3.10.4
 runner.dialect = scala3
 maxColumn = 80
 
diff --git a/build.sbt b/build.sbt
index 5ddfe5a..2daba76 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,4 +1,4 @@
-val scala3: String = "3.7.4"
+val scala3: String = "3.8.1"
 
 ThisBuild / scalaVersion  := scala3
 ThisBuild / versionScheme := Some("semver-spec")
@@ -29,10 +29,10 @@ val Deps = new {
   }
 
   val Gs = new {
-    val Datagen: ModuleID = "gs" %% "gs-datagen-core-v0" % "0.3.3"
+    val Datagen: ModuleID = "gs" %% "gs-datagen-core-v0" % "0.4.1"
   }
 
-  val MUnit: ModuleID = "org.scalameta" %% "munit" % "1.1.1"
+  val MUnit: ModuleID = "org.scalameta" %% "munit" % "1.2.1"
 }
 
 lazy val testSettings = Seq(
diff --git a/project/build.properties b/project/build.properties
index 01a16ed..30b7fd9 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.11.7
+sbt.version=1.12.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 83e5dc1..1db1aad 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -28,6 +28,6 @@ externalResolvers := Seq(
   "Garrity Software Releases" at "https://maven.garrity.co/gs"
 )
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage"        % "2.3.1")
-addSbtPlugin("gs"            % "sbt-garrity-software" % "0.6.0")
+addSbtPlugin("org.scoverage" % "sbt-scoverage"        % "2.4.4")
+addSbtPlugin("gs"            % "sbt-garrity-software" % "0.7.0")
 addSbtPlugin("gs"            % "sbt-gs-semver"        % "0.3.0")
diff --git a/src/test/scala/gs/predicate/v0/json/JsonComparisonPredicateTests.scala b/src/test/scala/gs/predicate/v0/json/JsonComparisonPredicateTests.scala
index 416ea78..1b1fd2d 100644
--- a/src/test/scala/gs/predicate/v0/json/JsonComparisonPredicateTests.scala
+++ b/src/test/scala/gs/predicate/v0/json/JsonComparisonPredicateTests.scala
@@ -1,7 +1,7 @@
 package gs.predicate.v0.json
 
 import gs.datagen.v0.Gen
-import gs.datagen.v0.generators.Size
+import gs.datagen.v0.generators.Range
 import gs.predicate.v0.api.Predicate
 import gs.predicate.v0.json.query.JsonQuery
 import io.circe.Json
@@ -43,10 +43,10 @@ object JsonComparisonPredicateTests:
 
   object Data:
 
-    val keyGen: Gen[String] = Gen.string.alphaNumeric(Size.between(4, 16))
+    val keyGen: Gen[String] = Gen.string.alphaNumeric(Range.between(4, 16))
 
     val strValGen: Gen[Json] =
-      Gen.string.uppercaseAlpha(Size.fixed(8)).map(Json.fromString)
+      Gen.string.uppercaseAlpha(Range.fixed(8)).map(Json.fromString)
 
   end Data
 
diff --git a/src/test/scala/gs/predicate/v0/json/JsonComparisonTests.scala b/src/test/scala/gs/predicate/v0/json/JsonComparisonTests.scala
index 3a8a14a..017f942 100644
--- a/src/test/scala/gs/predicate/v0/json/JsonComparisonTests.scala
+++ b/src/test/scala/gs/predicate/v0/json/JsonComparisonTests.scala
@@ -1,8 +1,7 @@
 package gs.predicate.v0.json
 
 import gs.datagen.v0.Gen
-import gs.datagen.v0.generators.MinMax
-import gs.datagen.v0.generators.Size
+import gs.datagen.v0.generators.Range
 import io.circe.Json
 import java.time.LocalDate
 import munit.FunSuite
@@ -235,11 +234,11 @@ class JsonComparisonTests extends FunSuite:
 
 object JsonComparisonTests:
 
-  val keyGen: Gen[String]      = Gen.string.alphaNumeric(Size.between(8, 16))
-  val strGen: Gen[String]      = Gen.string.alphaNumeric(Size.between(8, 16))
-  val longStrGen: Gen[String]  = Gen.string.alphaNumeric(Size.fixed(32))
+  val keyGen: Gen[String]      = Gen.string.alphaNumeric(Range.between(8, 16))
+  val strGen: Gen[String]      = Gen.string.alphaNumeric(Range.between(8, 16))
+  val longStrGen: Gen[String]  = Gen.string.alphaNumeric(Range.fixed(32))
   val jsonStringGen: Gen[Json] = strGen.map(Json.fromString)
   val intGen: Gen[Int]         = Gen.integer.inRange(0, 100)
-  val dateGen: Gen[LocalDate]  = Gen.date.aroundToday(MinMax(1, 3))
+  val dateGen: Gen[LocalDate]  = Gen.date.aroundToday(Range.between(1, 3))
 
 end JsonComparisonTests
diff --git a/src/test/scala/gs/predicate/v0/string/StringComparisonTests.scala b/src/test/scala/gs/predicate/v0/string/StringComparisonTests.scala
index 4b3a43e..f8f4f4d 100644
--- a/src/test/scala/gs/predicate/v0/string/StringComparisonTests.scala
+++ b/src/test/scala/gs/predicate/v0/string/StringComparisonTests.scala
@@ -1,8 +1,7 @@
 package gs.predicate.v0.string
 
 import gs.datagen.v0.Gen
-import gs.datagen.v0.generators.MinMax
-import gs.datagen.v0.generators.Size
+import gs.datagen.v0.generators.Range
 import java.time.LocalDate
 import munit.FunSuite
 
@@ -215,10 +214,10 @@ class StringComparisonTests extends FunSuite:
 
 object StringComparisonTests:
 
-  val keyGen: Gen[String]     = Gen.string.alphaNumeric(Size.between(8, 16))
-  val strGen: Gen[String]     = Gen.string.alphaNumeric(Size.between(8, 16))
-  val longStrGen: Gen[String] = Gen.string.alphaNumeric(Size.fixed(32))
+  val keyGen: Gen[String]     = Gen.string.alphaNumeric(Range.between(8, 16))
+  val strGen: Gen[String]     = Gen.string.alphaNumeric(Range.between(8, 16))
+  val longStrGen: Gen[String] = Gen.string.alphaNumeric(Range.fixed(32))
   val intGen: Gen[Int]        = Gen.integer.inRange(0, 100)
-  val dateGen: Gen[LocalDate] = Gen.date.aroundToday(MinMax(1, 3))
+  val dateGen: Gen[LocalDate] = Gen.date.aroundToday(Range.between(1, 3))
 
 end StringComparisonTests