diff --git a/packages/bigint/package-lock.json b/packages/bigint/package-lock.json
index 1f6298b..00eab58 100644
--- a/packages/bigint/package-lock.json
+++ b/packages/bigint/package-lock.json
@@ -9,8 +9,8 @@
       "version": "0.0.0-development",
       "license": "MIT",
       "dependencies": {
-        "@grandom/core": "^1.6.0",
-        "@grandom/engines": "^1.0.2"
+        "@grandom/core": "^2.4.0",
+        "@grandom/engines": "^2.1.0"
       },
       "devDependencies": {
         "@rollup/plugin-terser": "^0.4.3",
@@ -23,9 +23,9 @@
         "@types/jest": "^29.5.3",
         "@types/node": "^16.18.38",
         "@types/semantic-release": "^20.0.1",
-        "jest": "^29.6.1",
-        "jest-extended": "^4.0.0",
-        "rollup": "^3.26.3",
+        "jest": "^29.6.2",
+        "jest-extended": "^4.0.1",
+        "rollup": "^3.28.0",
         "semantic-release": "^19.0.5",
         "semantic-release-monorepo": "^7.0.5",
         "snazzy": "^9.0.0",
@@ -33,7 +33,7 @@
         "ts-jest": "^29.1.1",
         "ts-node": "^10.9.1",
         "ts-standard": "^12.0.2",
-        "tslib": "^2.6.0",
+        "tslib": "^2.6.2",
         "typescript": "^4.9.4"
       },
       "engines": {
@@ -806,24 +806,33 @@
       }
     },
     "node_modules/@grandom/core": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@grandom/core/-/core-1.6.0.tgz",
-      "integrity": "sha512-k4TmcJxN+/9afNf5e3yjap3n7cVaPpLCSe4yd+q/lm24CQ3KcOVfGwF2q1gemgPzbrcJSiza4RrIkxPGHvsXqA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@grandom/core/-/core-2.4.0.tgz",
+      "integrity": "sha512-5otCr5zsfIwl/eDB2KseaEjS6cvVSY6ySrnykQvksmVQR+tKBJSV9P+97Rpnnpv6zYQsWmayTl16n2cAN6Tgjg==",
       "engines": {
         "node": ">= 16"
       }
     },
     "node_modules/@grandom/engines": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@grandom/engines/-/engines-1.3.0.tgz",
-      "integrity": "sha512-mX2m9/aYvZehAc+MT9l6W/smigyrOsaYXUIGMzElhz4WsiynssoAesEjoVhNKjoQo6A/9zXjYQ0Bve+ZIIv1WQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@grandom/engines/-/engines-2.1.0.tgz",
+      "integrity": "sha512-DcQqKpSoVnk3tu+fNSA4T+Ag+p6nu4Yf/SXMhlYpdUKykErK58+7EUZxQUqSRXDSSlhisim2i/b6lhEI9B/rWA==",
       "dependencies": {
-        "@grandom/core": "^1.6.0"
+        "@grandom/core": "^2.4.0",
+        "@grandom/mt19937": "^1.0.0"
       },
       "engines": {
         "node": ">= 16"
       }
     },
+    "node_modules/@grandom/mt19937": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@grandom/mt19937/-/mt19937-1.0.0.tgz",
+      "integrity": "sha512-Ym/YOLU+/ldfTpc0+7UG3h/lkXZhA1H0ABSeM9Lq/Z06TOGg9u6aFyExHN3BfmqCIexzui4bqSefiutCSHtBXA==",
+      "engines": {
+        "node": ">= 16"
+      }
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
@@ -12079,9 +12088,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
       "dev": true
     },
     "node_modules/tsutils": {
@@ -13209,18 +13218,24 @@
       "dev": true
     },
     "@grandom/core": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@grandom/core/-/core-1.6.0.tgz",
-      "integrity": "sha512-k4TmcJxN+/9afNf5e3yjap3n7cVaPpLCSe4yd+q/lm24CQ3KcOVfGwF2q1gemgPzbrcJSiza4RrIkxPGHvsXqA=="
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@grandom/core/-/core-2.4.0.tgz",
+      "integrity": "sha512-5otCr5zsfIwl/eDB2KseaEjS6cvVSY6ySrnykQvksmVQR+tKBJSV9P+97Rpnnpv6zYQsWmayTl16n2cAN6Tgjg=="
     },
     "@grandom/engines": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@grandom/engines/-/engines-1.3.0.tgz",
-      "integrity": "sha512-mX2m9/aYvZehAc+MT9l6W/smigyrOsaYXUIGMzElhz4WsiynssoAesEjoVhNKjoQo6A/9zXjYQ0Bve+ZIIv1WQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@grandom/engines/-/engines-2.1.0.tgz",
+      "integrity": "sha512-DcQqKpSoVnk3tu+fNSA4T+Ag+p6nu4Yf/SXMhlYpdUKykErK58+7EUZxQUqSRXDSSlhisim2i/b6lhEI9B/rWA==",
       "requires": {
-        "@grandom/core": "^1.6.0"
+        "@grandom/core": "^2.4.0",
+        "@grandom/mt19937": "^1.0.0"
       }
     },
+    "@grandom/mt19937": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@grandom/mt19937/-/mt19937-1.0.0.tgz",
+      "integrity": "sha512-Ym/YOLU+/ldfTpc0+7UG3h/lkXZhA1H0ABSeM9Lq/Z06TOGg9u6aFyExHN3BfmqCIexzui4bqSefiutCSHtBXA=="
+    },
     "@humanwhocodes/config-array": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
@@ -21446,9 +21461,9 @@
       }
     },
     "tslib": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
       "dev": true
     },
     "tsutils": {
diff --git a/packages/bigint/package.json b/packages/bigint/package.json
index bf0f452..4a049fd 100644
--- a/packages/bigint/package.json
+++ b/packages/bigint/package.json
@@ -48,9 +48,9 @@
     "@types/jest": "^29.5.3",
     "@types/node": "^16.18.38",
     "@types/semantic-release": "^20.0.1",
-    "jest": "^29.6.1",
-    "jest-extended": "^4.0.0",
-    "rollup": "^3.26.3",
+    "jest": "^29.6.2",
+    "jest-extended": "^4.0.1",
+    "rollup": "^3.28.0",
     "semantic-release": "^19.0.5",
     "semantic-release-monorepo": "^7.0.5",
     "snazzy": "^9.0.0",
@@ -58,11 +58,11 @@
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
     "ts-standard": "^12.0.2",
-    "tslib": "^2.6.0",
+    "tslib": "^2.6.2",
     "typescript": "^4.9.4"
   },
   "dependencies": {
-    "@grandom/core": "^1.6.0",
-    "@grandom/engines": "^1.0.2"
+    "@grandom/core": "^2.4.0",
+    "@grandom/engines": "^2.1.0"
   }
 }
diff --git a/packages/bigint/src/RandomBigInt/index.ts b/packages/bigint/src/RandomBigInt/index.ts
index 3b30aa9..ea01edc 100644
--- a/packages/bigint/src/RandomBigInt/index.ts
+++ b/packages/bigint/src/RandomBigInt/index.ts
@@ -1,7 +1,7 @@
 // TODO: implement edge cases (including infinite loops)
 // TODO: implement detailed error handling
 
-import { RandomEngine } from '@grandom/core'
+import { RandomEngine, RandomGenerator } from '@grandom/core'
 
 import BigIntFilter, { type Filter } from '../BigIntFilter'
 
@@ -28,13 +28,7 @@ type BigIntOptions = {
   maximum?: number | bigint
 } & ConfigOptions
 
-export default class RandomBigInt {
-  private readonly _engine: RandomEngine
-
-  constructor (engine: RandomEngine) {
-    this._engine = engine
-  }
-
+export default class RandomBigInt extends RandomGenerator {
   bigint (): bigint
 
   bigint (maximum: number | bigint): bigint
diff --git a/packages/bigint/src/index.ts b/packages/bigint/src/index.ts
index 3fc1c74..fe66f37 100644
--- a/packages/bigint/src/index.ts
+++ b/packages/bigint/src/index.ts
@@ -1,4 +1,3 @@
-
 import BasicEngine from '@grandom/engines/basic'
 import RandomBigInt from './RandomBigInt'