diff --git a/packages/object/tests/hashgraph.bench.ts b/packages/object/tests/hashgraph.bench.ts
index 930ce36c..15021297 100644
--- a/packages/object/tests/hashgraph.bench.ts
+++ b/packages/object/tests/hashgraph.bench.ts
@@ -2,7 +2,7 @@ import { MapDRP } from "@ts-drp/blueprints/src/index.js";
 import { SetDRP } from "@ts-drp/blueprints/src/index.js";
 import Benchmark from "benchmark";
 
-import { DRPObject, ObjectACL } from "../src/index.js";
+import { DRP, DRPObject, ObjectACL } from "../src/index.js";
 
 const acl = new ObjectACL({
 	admins: new Map([["peer1", { ed25519PublicKey: "pubKey1", blsPublicKey: "pubKey1" }]]),
@@ -72,7 +72,7 @@ suite.add("Create a HashGraph with 1000 operations for set wins map", () => {
 		acl,
 		drp: new MapDRP<number, number>(),
 	});
-	const drp = object.drp as unknown as MapDRP<number, number>;
+	const drp = object.drp as DRP as MapDRP<number, number>;
 	for (let i = 0; i < 1000; ++i) {
 		drp.set(i, i);
 	}
@@ -84,7 +84,7 @@ suite.add(`Create a HashGraph with ${NUMBER_OF_OPERATIONS} operations for set wi
 		acl,
 		drp: new MapDRP<number, number>(),
 	});
-	const drp = object.drp as unknown as MapDRP<number, number>;
+	const drp = object.drp as DRP as MapDRP<number, number>;
 	for (let i = 0; i < NUMBER_OF_OPERATIONS; ++i) {
 		drp.set(i, i);
 	}
@@ -98,7 +98,7 @@ suite.add(
 			acl,
 			drp: new MapDRP<number, number>(),
 		});
-		const drp = object.drp as unknown as MapDRP<number, number>;
+		const drp = object.drp as DRP as MapDRP<number, number>;
 		for (let i = 0; i < NUMBER_OF_OPERATIONS; ++i) {
 			drp.set(i, i);
 		}
@@ -116,7 +116,7 @@ suite.add(
 			acl,
 			drp: new MapDRP<number, number>(),
 		});
-		const drp = object.drp as unknown as MapDRP<number, number>;
+		const drp = object.drp as DRP as MapDRP<number, number>;
 		for (let i = 0; i < NUMBER_OF_OPERATIONS; ++i) {
 			drp.set(i, i);
 		}
@@ -135,7 +135,7 @@ suite.add(
 			acl,
 			drp: new MapDRP<number, number>(),
 		});
-		const drp = object.drp as unknown as MapDRP<number, number>;
+		const drp = object.drp as DRP as MapDRP<number, number>;
 		for (let i = 0; i < 250; i += 4) {
 			drp.set(i, i);
 			if (i % 2 === 0) {
@@ -180,7 +180,7 @@ suite.add(
 			acl,
 			drp: new MapDRP<number, number>(),
 		});
-		const drp1 = object1.drp as unknown as MapDRP<number, number>;
+		const drp1 = object1.drp as DRP as MapDRP<number, number>;
 		initialize(drp1);
 
 		const object2: DRPObject = new DRPObject({
@@ -188,7 +188,7 @@ suite.add(
 			acl,
 			drp: new MapDRP<number, number>(),
 		});
-		const drp2 = object2.drp as unknown as MapDRP<number, number>;
+		const drp2 = object2.drp as DRP as MapDRP<number, number>;
 		initialize(drp2);
 
 		object1.merge(object2.hashGraph.getAllVertices());
diff --git a/packages/object/tests/hashgraph.test.ts b/packages/object/tests/hashgraph.test.ts
index 46b69763..b431f4b5 100644
--- a/packages/object/tests/hashgraph.test.ts
+++ b/packages/object/tests/hashgraph.test.ts
@@ -763,8 +763,8 @@ describe("HashGraph for set wins map tests", () => {
 		      \
 		       -- V2:SET("key2, "value2")
 		*/
-		const drp1 = obj1.drp as unknown as MapDRP<string, string>;
-		const drp2 = obj2.drp as unknown as MapDRP<string, string>;
+		const drp1 = obj1.drp as DRP as MapDRP<string, string>;
+		const drp2 = obj2.drp as DRP as MapDRP<string, string>;
 		drp1.set("key1", "value1");
 		drp2.set("key2", "value2");
 		drp1.delete("key1");
@@ -785,8 +785,8 @@ describe("HashGraph for set wins map tests", () => {
 		       --- V2:SET("key1", "value1") -- V3:DELETE("key1") -- V4:SET("key2", "value2")
 		*/
 
-		const drp1 = obj1.drp as unknown as MapDRP<string, string>;
-		const drp2 = obj2.drp as unknown as MapDRP<string, string>;
+		const drp1 = obj1.drp as DRP as MapDRP<string, string>;
+		const drp2 = obj2.drp as DRP as MapDRP<string, string>;
 
 		drp1.set("key1", "value2"); // smaller hash
 		drp2.set("key1", "value1"); // greater hash
@@ -814,9 +814,9 @@ describe("HashGraph for set wins map tests", () => {
 		       \                                                    ----------------------------\
 		        -- V6:SET("key2", "eulav3") ---------------------------------------------------- v8:SET("key1", "value")
 		*/
-		const drp1 = obj1.drp as unknown as MapDRP<string, string>;
-		const drp2 = obj2.drp as unknown as MapDRP<string, string>;
-		const drp3 = obj3.drp as unknown as MapDRP<string, string>;
+		const drp1 = obj1.drp as DRP as MapDRP<string, string>;
+		const drp2 = obj2.drp as DRP as MapDRP<string, string>;
+		const drp3 = obj3.drp as DRP as MapDRP<string, string>;
 
 		drp1.set("key1", "value1");
 		drp1.delete("key2");
@@ -864,8 +864,8 @@ describe("HashGraph for delete wins map tests", () => {
 		      \
 		       -- V2:SET("key1", "value2") -- DELETE("key1")
 		*/
-		const drp1 = obj1.drp as unknown as MapDRP<string, string>;
-		const drp2 = obj2.drp as unknown as MapDRP<string, string>;
+		const drp1 = obj1.drp as DRP as MapDRP<string, string>;
+		const drp2 = obj2.drp as DRP as MapDRP<string, string>;
 
 		drp1.set("key1", "value1"); // greater hash
 		drp2.set("key1", "value2"); // smaller hash
@@ -885,8 +885,8 @@ describe("HashGraph for delete wins map tests", () => {
 		       --V2:SET("key1", "value1") -- V4:SET("key2", "value3")
 		*/
 
-		const drp1 = obj1.drp as unknown as MapDRP<string, string>;
-		const drp2 = obj2.drp as unknown as MapDRP<string, string>;
+		const drp1 = obj1.drp as DRP as MapDRP<string, string>;
+		const drp2 = obj2.drp as DRP as MapDRP<string, string>;
 
 		drp1.set("key1", "value2");
 		drp2.set("key1", "value1");
@@ -927,8 +927,8 @@ describe("Hash validation tests", () => {
 	});
 
 	test("Should accept vertices with valid hash", () => {
-		const drp1 = obj1.drp as unknown as MapDRP<string, string>;
-		const drp2 = obj2.drp as unknown as MapDRP<string, string>;
+		const drp1 = obj1.drp as DRP as MapDRP<string, string>;
+		const drp2 = obj2.drp as DRP as MapDRP<string, string>;
 		drp1.set("key1", "value1");
 		drp2.set("key2", "value2");