diff --git a/README.md b/README.md
index a60d85f..a394221 100755
--- a/README.md
+++ b/README.md
@@ -319,26 +319,26 @@ byte[] buf = idlArgs.toBytes();
 
 To add IC4J Agent library to your Java project use Maven or Gradle import from Maven Central.
 
-<a href="https://search.maven.org/artifact/org.ic4j/ic4j-agent/0.7.1/jar">
-https://search.maven.org/artifact/org.ic4j/ic4j-agent/0.7.1/jar
+<a href="https://search.maven.org/artifact/org.ic4j/ic4j-agent/0.7.4/jar">
+https://search.maven.org/artifact/org.ic4j/ic4j-agent/0.7.4/jar
 </a>
 
 ```
 <dependency>
   <groupId>org.ic4j</groupId>
   <artifactId>ic4j-agent</artifactId>
-  <version>0.7.1</version>
+  <version>0.7.4</version>
 </dependency>
 <dependency>
   <groupId>org.ic4j</groupId>
   <artifactId>ic4j-candid</artifactId>
-  <version>0.7.1</version>
+  <version>0.7.4</version>
 </dependency>
 ```
 
 ```
-implementation 'org.ic4j:ic4j-agent:0.7.1'
-implementation 'org.ic4j:ic4j-candid:0.7.1'
+implementation 'org.ic4j:ic4j-agent:0.7.4'
+implementation 'org.ic4j:ic4j-candid:0.7.4'
 ```
 
 
diff --git a/build.gradle b/build.gradle
index 1993277..c5bb1b5 100755
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,6 @@ version '0.0.1'
 
 
 repositories {
-    mavenLocal()
     mavenCentral()
 }
 
@@ -54,19 +53,19 @@ test {
 }
 
 dependencies {
-	implementation group: 'org.ic4j', name: 'ic4j-candid', version: '0.7.1'
-	
-	// https://mvnrepository.com/artifact/commons-codec/commons-codec
-	implementation group: 'commons-codec', name: 'commons-codec', version: '1.17.0'
-	
-	// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
-	implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
+	// https://mvnrepository.com/artifact/org.slf4j/slf4j-api
+	compileOnly group: 'org.slf4j', name: 'slf4j-api', version: '2.0.16'
 
 	// https://mvnrepository.com/artifact/org.apache.httpcomponents.client5/httpclient5
-	implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.3.1'
+	compileOnly group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.3.1'
 	
 	// https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
-	implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0'
+	compileOnly group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0'
+
+	implementation group: 'org.ic4j', name: 'ic4j-candid', version: '0.7.4'
+
+	// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
+	implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
 	
 	// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
 	implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.17.2'
@@ -82,21 +81,27 @@ dependencies {
 
 	// https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk18on
 	implementation group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: '1.78.1'
-	
-	// https://mvnrepository.com/artifact/org.slf4j/slf4j-simple
-	implementation group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.13'	
 
 	// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
-	testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0'
+	testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.11.0'
 	
 	// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
-	testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0'
+	testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.11.0'
 	
 	// https://mvnrepository.com/artifact/org.junit.platform/junit-platform-launcher
-	testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.10.0'	
+	testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.11.0'
+
+	// https://mvnrepository.com/artifact/org.slf4j/slf4j-simple
+	testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.16'
+
+	// https://mvnrepository.com/artifact/org.apache.httpcomponents.client5/httpclient5
+	testImplementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.3.1'
+
+	// https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
+	testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0'
 	
 	// https://mvnrepository.com/artifact/org.skyscreamer/jsonassert
-	testImplementation group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.1'	
+	testImplementation group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.3'
 	
 	// https://mvnrepository.com/artifact/org.mock-server/mockserver-netty
 	testImplementation group: 'org.mock-server', name: 'mockserver-netty', version: '5.11.2'
diff --git a/src/main/java/org/ic4j/agent/Agent.java b/src/main/java/org/ic4j/agent/Agent.java
index 93b0907..d84c03c 100644
--- a/src/main/java/org/ic4j/agent/Agent.java
+++ b/src/main/java/org/ic4j/agent/Agent.java
@@ -39,7 +39,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
-import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.lang3.ArrayUtils;
 import org.bouncycastle.asn1.edec.EdECObjectIdentifiers;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
@@ -101,7 +100,7 @@ public final class Agent {
 	static {
 		try {
 			BLS_VERIFY = Boolean.parseBoolean(System.getProperty(BLS_VERIFY_PROPERTY, "true"));
-			IC_ROOT_KEY = Hex.decodeHex("308182301d060d2b0601040182dc7c0503010201060c2b0601040182dc7c05030201036100814c0e6ec71fab583b08bd81373c255c3c371b2e84863c98a4f1e08b74235d14fb5d9c0cd546d9685f913a0c0b2cc5341583bf4b4392e467db96d65b9bb4cb717112f8472e0d5a4d14505ffd7484b01291091c5f87b98883463f98091a0baaae".toCharArray());
+			IC_ROOT_KEY = Hex.decodeHex("308182301d060d2b0601040182dc7c0503010201060c2b0601040182dc7c05030201036100814c0e6ec71fab583b08bd81373c255c3c371b2e84863c98a4f1e08b74235d14fb5d9c0cd546d9685f913a0c0b2cc5341583bf4b4392e467db96d65b9bb4cb717112f8472e0d5a4d14505ffd7484b01291091c5f87b98883463f98091a0baaae");
 		} catch (Exception e) {
 			throw AgentError.create(AgentError.AgentErrorCode.CUSTOM_ERROR, e);
 		}
diff --git a/src/main/java/org/ic4j/agent/DigestUtils.java b/src/main/java/org/ic4j/agent/DigestUtils.java
new file mode 100644
index 0000000..3c95faf
--- /dev/null
+++ b/src/main/java/org/ic4j/agent/DigestUtils.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024 Exilor Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+package org.ic4j.agent;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import javax.xml.bind.DatatypeConverter;
+
+public class DigestUtils {
+	
+	public static MessageDigest getSha256Digest() {
+		MessageDigest messageDigest;
+		try {
+			messageDigest = MessageDigest.getInstance("SHA-256");
+			
+			return messageDigest;
+		} catch (NoSuchAlgorithmException e) {
+			throw AgentError.create(AgentError.AgentErrorCode.CUSTOM_ERROR, e);
+		}
+    }
+	
+    // Compute SHA-256 hash
+    public static byte[] sha256(byte[] bytes)  {
+        MessageDigest digest = getSha256Digest();
+        return digest.digest(bytes);
+    }
+       
+}
diff --git a/src/main/java/org/ic4j/agent/Hex.java b/src/main/java/org/ic4j/agent/Hex.java
new file mode 100644
index 0000000..cc2bea4
--- /dev/null
+++ b/src/main/java/org/ic4j/agent/Hex.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024 Exilor Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+package org.ic4j.agent;
+
+public class Hex {
+    // Convert hexadecimal string to byte array
+    public static byte[] decodeHex(String s) {
+        int len = s.length();
+        if (len % 2 != 0) {
+            throw new IllegalArgumentException("Hexadecimal string must have an even length");
+        }
+        byte[] data = new byte[len / 2];
+        for (int i = 0; i < len; i += 2) {
+            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
+                                  + Character.digit(s.charAt(i+1), 16));
+        }
+        return data;
+    }	
+    
+    
+    // Convert byte array to hexadecimal string manually
+    public static String encodeHexString(byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+        for (byte b : bytes) {
+            sb.append(String.format("%02x", b));
+        }
+        return sb.toString();
+    }
+}
diff --git a/src/main/java/org/ic4j/agent/ResponseAuthentication.java b/src/main/java/org/ic4j/agent/ResponseAuthentication.java
index 9b8ea6c..a9f4b0e 100644
--- a/src/main/java/org/ic4j/agent/ResponseAuthentication.java
+++ b/src/main/java/org/ic4j/agent/ResponseAuthentication.java
@@ -24,8 +24,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.lang3.ArrayUtils;
 import org.ic4j.agent.certification.Certificate;
 import org.ic4j.agent.certification.hashtree.HashTree;
@@ -45,274 +43,247 @@
 public final class ResponseAuthentication {
 	static final byte[] DER_PREFIX;
 	static final int KEY_LENGTH = 96;
-	
+
 	static {
-		try {
-			DER_PREFIX = Hex.decodeHex("308182301d060d2b0601040182dc7c0503010201060c2b0601040182dc7c05030201036100".toCharArray());
-		} catch (DecoderException e) {
-			throw AgentError.create(AgentError.AgentErrorCode.CUSTOM_ERROR, e);
-		}
+		DER_PREFIX = Hex.decodeHex("308182301d060d2b0601040182dc7c0503010201060c2b0601040182dc7c05030201036100");
 	}
-	
-	static byte[] extractDer(byte[] buf) throws AgentError
-	{
+
+	static byte[] extractDer(byte[] buf) throws AgentError {
 		int expectedLength = DER_PREFIX.length + KEY_LENGTH;
-		
-		if(buf.length != expectedLength)
-			throw AgentError.create(AgentError.AgentErrorCode.DER_KEY_LENGTH_MISMATCH,expectedLength,buf.length);
-		
-		byte[] prefix = ArrayUtils.subarray(buf, 0 , DER_PREFIX.length);
-		
-		if(!Arrays.equals(DER_PREFIX, prefix))
-			throw AgentError.create(AgentError.AgentErrorCode.DER_PREFIX_MISMATCH,expectedLength,buf.length);
-		
-		return ArrayUtils.subarray(buf, DER_PREFIX.length , buf.length);
+
+		if (buf.length != expectedLength)
+			throw AgentError.create(AgentError.AgentErrorCode.DER_KEY_LENGTH_MISMATCH, expectedLength, buf.length);
+
+		byte[] prefix = ArrayUtils.subarray(buf, 0, DER_PREFIX.length);
+
+		if (!Arrays.equals(DER_PREFIX, prefix))
+			throw AgentError.create(AgentError.AgentErrorCode.DER_PREFIX_MISMATCH, expectedLength, buf.length);
+
+		return ArrayUtils.subarray(buf, DER_PREFIX.length, buf.length);
 	}
-	
-	static RequestStatusResponse lookupRequestStatus(Certificate certificate, RequestId requestId) throws AgentError
-	{
+
+	static RequestStatusResponse lookupRequestStatus(Certificate certificate, RequestId requestId) throws AgentError {
 		List<Label> pathStatus = new ArrayList<Label>();
-		pathStatus.add(new Label("request_status"));			
+		pathStatus.add(new Label("request_status"));
 		pathStatus.add(new Label(requestId.get()));
 		pathStatus.add(new Label("status"));
-		
+
 		LookupResult result = certificate.tree.lookupPath(pathStatus);
-		
-		switch(result.status)
-		{
-			case ABSENT: 
-				throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_ABSENT, pathStatus);
-			case UNKNOWN: 
-				return new RequestStatusResponse(RequestStatusResponse.InnerStatus.UNKNOWN_STATUS);
-			case FOUND: 
-			{			
-				String status = new String(result.value, StandardCharsets.UTF_8);
-				
-				switch(status)
-				{
-					case RequestStatusResponse.DONE_STATUS_VALUE:
-						return new RequestStatusResponse(RequestStatusResponse.InnerStatus.DONE_STATUS);
-					case RequestStatusResponse.PROCESSING_STATUS_VALUE:
-						return new RequestStatusResponse(RequestStatusResponse.InnerStatus.PROCESSING_STATUS);
-					case RequestStatusResponse.RECEIVED_STATUS_VALUE:
-						return new RequestStatusResponse(RequestStatusResponse.InnerStatus.RECEIVED_STATUS);
-					case RequestStatusResponse.REJECTED_STATUS_VALUE:
-						return lookupRejection(certificate,requestId);
-					case RequestStatusResponse.REPLIED_STATUS_VALUE:
-						return lookupReply(certificate,requestId);
-					default:
-						throw AgentError.create(AgentError.AgentErrorCode.INVALID_REQUEST_STATUS, pathStatus, status);						
-
-				}
-			}
 
+		switch (result.status) {
+		case ABSENT:
+			throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_ABSENT, pathStatus);
+		case UNKNOWN:
+			return new RequestStatusResponse(RequestStatusResponse.InnerStatus.UNKNOWN_STATUS);
+		case FOUND: {
+			String status = new String(result.value, StandardCharsets.UTF_8);
+
+			switch (status) {
+			case RequestStatusResponse.DONE_STATUS_VALUE:
+				return new RequestStatusResponse(RequestStatusResponse.InnerStatus.DONE_STATUS);
+			case RequestStatusResponse.PROCESSING_STATUS_VALUE:
+				return new RequestStatusResponse(RequestStatusResponse.InnerStatus.PROCESSING_STATUS);
+			case RequestStatusResponse.RECEIVED_STATUS_VALUE:
+				return new RequestStatusResponse(RequestStatusResponse.InnerStatus.RECEIVED_STATUS);
+			case RequestStatusResponse.REJECTED_STATUS_VALUE:
+				return lookupRejection(certificate, requestId);
+			case RequestStatusResponse.REPLIED_STATUS_VALUE:
+				return lookupReply(certificate, requestId);
 			default:
-				throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_ERROR, pathStatus);
-		
+				throw AgentError.create(AgentError.AgentErrorCode.INVALID_REQUEST_STATUS, pathStatus, status);
+
+			}
+		}
+
+		default:
+			throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_ERROR, pathStatus);
+
 		}
-		
+
 	}
-	
-	static RequestStatusResponse lookupRejection(Certificate certificate, RequestId requestId)
-	{
+
+	static RequestStatusResponse lookupRejection(Certificate certificate, RequestId requestId) {
 		Integer rejectCode = lookupRejectCode(certificate, requestId);
 		String rejectMessage = lookupRejectMessage(certificate, requestId);
-		
+
 		return new RequestStatusResponse(rejectCode, rejectMessage);
-		
+
 	}
-	
-	static Integer lookupRejectCode(Certificate certificate, RequestId requestId)
-	{
+
+	static Integer lookupRejectCode(Certificate certificate, RequestId requestId) {
 		List<Label> path = new ArrayList<Label>();
-		path.add(new Label("request_status"));			
+		path.add(new Label("request_status"));
 		path.add(new Label(requestId.get()));
 		path.add(new Label("reject_code"));
-		
-		byte[] code = lookupValue(certificate,path);
-		
-		return Leb128.readUnsigned(code);		
+
+		byte[] code = lookupValue(certificate, path);
+
+		return Leb128.readUnsigned(code);
 	}
-	
-	static String lookupRejectMessage(Certificate certificate, RequestId requestId)
-	{
+
+	static String lookupRejectMessage(Certificate certificate, RequestId requestId) {
 		List<Label> path = new ArrayList<Label>();
-		path.add(new Label("request_status"));			
+		path.add(new Label("request_status"));
 		path.add(new Label(requestId.get()));
 		path.add(new Label("reject_message"));
-		
-		byte[] msg = lookupValue(certificate,path);
-		
+
+		byte[] msg = lookupValue(certificate, path);
+
 		return new String(msg, StandardCharsets.UTF_8);
-	}	
-	
-	static RequestStatusResponse lookupReply(Certificate certificate, RequestId requestId)
-	{
+	}
+
+	static RequestStatusResponse lookupReply(Certificate certificate, RequestId requestId) {
 		List<Label> path = new ArrayList<Label>();
-		path.add(new Label("request_status"));			
+		path.add(new Label("request_status"));
 		path.add(new Label(requestId.get()));
 		path.add(new Label("reply"));
-		
-		byte[] replyData = lookupValue(certificate,path);	
-		
+
+		byte[] replyData = lookupValue(certificate, path);
+
 		CallReply reply = new CallReply(replyData);
-		
-		return new RequestStatusResponse(reply);				
+
+		return new RequestStatusResponse(reply);
 	}
-	
-	static SubnetResponse lookupSubnet(Certificate certificate, byte[] rootKey)
-	{
+
+	static SubnetResponse lookupSubnet(Certificate certificate, byte[] rootKey) {
 		ObjectMapper objectMapper = new ObjectMapper(new CBORFactory());
 		objectMapper.registerModule(new Jdk8Module());
-		
+
 		Principal subnetId = Agent.getSubnetId(certificate, rootKey);
-			
+
 		List<Label> path = new ArrayList<Label>();
-		path.add(new Label("subnet"));			
+		path.add(new Label("subnet"));
 		path.add(new Label(subnetId.getValue()));
-		
-		HashTree subnetTree = lookupTree(certificate,path);	
-		
-		path = new ArrayList<Label>();	
-		path.add(new Label("public_key"));			
-		
-		byte[] key = lookupValue(subnetTree,path);
-	
-		path = new ArrayList<Label>();	
-		path.add(new Label("node"));		
-		
-		HashTree nodeKeysSubtree = lookupTree(subnetTree,path);	
-		
-		Map<Principal,byte[]> nodeKeys = new HashMap<Principal, byte[]>();
-		
-		List<List<Label>> paths =  nodeKeysSubtree.listPaths();
-		
+
+		HashTree subnetTree = lookupTree(certificate, path);
+
+		path = new ArrayList<Label>();
+		path.add(new Label("public_key"));
+
+		byte[] key = lookupValue(subnetTree, path);
+
+		path = new ArrayList<Label>();
+		path.add(new Label("node"));
+
+		HashTree nodeKeysSubtree = lookupTree(subnetTree, path);
+
+		Map<Principal, byte[]> nodeKeys = new HashMap<Principal, byte[]>();
+
+		List<List<Label>> paths = nodeKeysSubtree.listPaths();
+
 		Label publicKeyLabel = new Label("public_key");
-		for(List<Label> pathItem : paths)
-		{
-			if(pathItem.size() < 2)
-				 // if it's absent, it's because this is the wrong subnet
+		for (List<Label> pathItem : paths) {
+			if (pathItem.size() < 2)
+				// if it's absent, it's because this is the wrong subnet
 				throw AgentError.create(AgentError.AgentErrorCode.CERTIFICATE_NOT_AUTHORIZED);
-			
-			if(!pathItem.get(1).equals(publicKeyLabel))
+
+			if (!pathItem.get(1).equals(publicKeyLabel))
 				continue;
-			
-			if(pathItem.size() > 2)
+
+			if (pathItem.size() > 2)
 				AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_ERROR, pathItem);
-			
+
 			Principal nodeId = Principal.from(pathItem.get(0).get());
-			
+
 			List<Label> itemPath = new ArrayList<Label>();
 			itemPath.add(new Label(nodeId.getValue()));
-			itemPath.add(new Label("public_key"));	
-			
-			byte[] nodeKey = lookupValue(nodeKeysSubtree,itemPath);
-			
+			itemPath.add(new Label("public_key"));
+
+			byte[] nodeKey = lookupValue(nodeKeysSubtree, itemPath);
+
 			nodeKeys.put(nodeId, nodeKey);
 		}
-		
-		path = new ArrayList<Label>();	
+
+		path = new ArrayList<Label>();
 		path.add(new Label("canister_ranges"));
-		
-		byte[] canisterRange = lookupValue(subnetTree,path);
-		List<PrincipalRange> ranges =  new ArrayList <PrincipalRange> ();
-		
-		try {	
-			
-			TypeReference<HashMap<Principal, Principal>> typeRef 
-			  = new TypeReference<HashMap<Principal, Principal>>() {};
-			
-
-			
-			List<List<byte[]>> rangesJson = new ArrayList <> ();
-					
+
+		byte[] canisterRange = lookupValue(subnetTree, path);
+		List<PrincipalRange> ranges = new ArrayList<PrincipalRange>();
+
+		try {
+			TypeReference<HashMap<Principal, Principal>> typeRef = new TypeReference<HashMap<Principal, Principal>>() {
+			};
+
+			List<List<byte[]>> rangesJson = new ArrayList<>();
+
 			rangesJson = objectMapper.readValue(canisterRange, List.class);
-			
-			for (Iterator <List<byte[]>> iterator = rangesJson.iterator(); iterator.hasNext();) {
+
+			for (Iterator<List<byte[]>> iterator = rangesJson.iterator(); iterator.hasNext();) {
 				List<byte[]> rangeJson = (List<byte[]>) iterator.next();
-				
+
 				PrincipalRange range = new PrincipalRange();
-				
+
 				range.low = Principal.from(rangeJson.get(0));
 				range.high = Principal.from(rangeJson.get(1));
 				ranges.add(range);
-		    }
-					
+			}
+
 		} catch (Exception e) {
-			throw AgentError.create(AgentError.AgentErrorCode.INVALID_CBOR_DATA, e, canisterRange.toString()); 
+			throw AgentError.create(AgentError.AgentErrorCode.INVALID_CBOR_DATA, e, canisterRange.toString());
 		}
-		
+
 		Subnet subnet = new Subnet();
-		
+
 		subnet.key = key;
 		subnet.nodeKeys = nodeKeys;
 		subnet.ranges = ranges;
-		
-		return new SubnetResponse(subnetId, subnet);				
+
+		return new SubnetResponse(subnetId, subnet);
 	}
-	
-	static byte[] lookupMetadata(Certificate certificate, Principal canisterId, String name)
-	{
+
+	static byte[] lookupMetadata(Certificate certificate, Principal canisterId, String name) {
 		List<Label> path = new ArrayList<Label>();
-		path.add(new Label("canister"));			
+		path.add(new Label("canister"));
 		path.add(new Label(canisterId.getValue()));
 		path.add(new Label("metadata"));
 		path.add(new Label(name));
-		
-		byte[] metadataData = lookupValue(certificate,path);	
-		
-		return metadataData;			
-	}	
-	
-	static byte[] lookupValue(Certificate certificate, List<Label> path)
-	{
-		return lookupValue(certificate.tree, path);		
+
+		byte[] metadataData = lookupValue(certificate, path);
+
+		return metadataData;
+	}
+
+	static byte[] lookupValue(Certificate certificate, List<Label> path) {
+		return lookupValue(certificate.tree, path);
 	}
-	
-	static byte[] lookupValue(HashTree tree, List<Label> path)
-	{
+
+	static byte[] lookupValue(HashTree tree, List<Label> path) {
 		LookupResult result = tree.lookupPath(path);
-		
-		switch(result.status)
-		{
-			case ABSENT: 
-				throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_ABSENT, path);
-			case UNKNOWN: 
-				throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_UNKNOWN, path);
-			case FOUND: 
-				return result.value;
-			case ERROR:
-				throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_ERROR, path);
-			default:
-				throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_ERROR, path);
-				
-		}		
-	}	
-	
-	static HashTree lookupTree(Certificate certificate, List<Label> path)
-	{
-		return lookupTree(certificate.tree, path);		
+
+		switch (result.status) {
+		case ABSENT:
+			throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_ABSENT, path);
+		case UNKNOWN:
+			throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_UNKNOWN, path);
+		case FOUND:
+			return result.value;
+		case ERROR:
+			throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_ERROR, path);
+		default:
+			throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_ERROR, path);
+
+		}
+	}
+
+	static HashTree lookupTree(Certificate certificate, List<Label> path) {
+		return lookupTree(certificate.tree, path);
 	}
-	
-	static HashTree lookupTree(HashTree tree, List<Label> path)
-	{
-		
+
+	static HashTree lookupTree(HashTree tree, List<Label> path) {
+
 		SubtreeLookupResult result = tree.lookupSubtree(path);
-		
-		
-		switch(result.status)
-		{
-			case ABSENT: 
-				throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_ABSENT, path);
-			case UNKNOWN: 
-				throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_UNKNOWN, path);
-			case FOUND: 
-				return result.value;
-			default:
-				throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_ERROR, path);
-				
-		}		
-	}	
-	
+
+		switch (result.status) {
+		case ABSENT:
+			throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_ABSENT, path);
+		case UNKNOWN:
+			throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_UNKNOWN, path);
+		case FOUND:
+			return result.value;
+		default:
+			throw AgentError.create(AgentError.AgentErrorCode.LOOKUP_PATH_ERROR, path);
+
+		}
+	}
 
 }
diff --git a/src/main/java/org/ic4j/agent/certification/hashtree/HashTreeNode.java b/src/main/java/org/ic4j/agent/certification/hashtree/HashTreeNode.java
index 818729d..84cf89a 100644
--- a/src/main/java/org/ic4j/agent/certification/hashtree/HashTreeNode.java
+++ b/src/main/java/org/ic4j/agent/certification/hashtree/HashTreeNode.java
@@ -23,7 +23,7 @@
 import java.util.Base64;
 import java.util.List;
 
-import org.apache.commons.codec.digest.DigestUtils;
+import org.ic4j.agent.DigestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/ic4j/agent/replicaapi/Delegation.java b/src/main/java/org/ic4j/agent/replicaapi/Delegation.java
index c9898fc..8ccaee5 100644
--- a/src/main/java/org/ic4j/agent/replicaapi/Delegation.java
+++ b/src/main/java/org/ic4j/agent/replicaapi/Delegation.java
@@ -19,10 +19,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.lang3.ArrayUtils;
-import org.ic4j.agent.AgentError;
+import org.ic4j.agent.Hex;
 import org.ic4j.agent.Serialize;
 import org.ic4j.agent.Serializer;
 import org.ic4j.agent.requestid.RequestId;
@@ -73,15 +71,11 @@ public byte[] signable()
 	{
 		byte[] hash = RequestId.toRequestId(this).get();
 		
-		try {
-			;
+
 			byte[] separator = ArrayUtils.addAll(Hex.decodeHex("1A"),IC_REQUEST_DELEGATION_DOMAIN_SEPARATOR);
 			byte[] bytes = ArrayUtils.addAll(separator,hash);
 			
 			return bytes;
-		} catch (DecoderException e) {
-			throw AgentError.create(AgentError.AgentErrorCode.CUSTOM_ERROR, e);
-		}
 	}
 
 	@Override
diff --git a/src/main/java/org/ic4j/agent/replicaapi/QueryResponse.java b/src/main/java/org/ic4j/agent/replicaapi/QueryResponse.java
index 6f3d793..9665e18 100644
--- a/src/main/java/org/ic4j/agent/replicaapi/QueryResponse.java
+++ b/src/main/java/org/ic4j/agent/replicaapi/QueryResponse.java
@@ -23,10 +23,9 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.lang3.ArrayUtils;
 import org.ic4j.agent.AgentError;
+import org.ic4j.agent.Hex;
 import org.ic4j.agent.requestid.RequestId;
 import org.ic4j.types.Principal;
 import org.ic4j.types.PrincipalError;
@@ -38,144 +37,130 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-public final class QueryResponse extends Response{
+public final class QueryResponse extends Response {
 	static final String REJECTED_STATUS_VALUE = "rejected";
 	static final String REPLIED_STATUS_VALUE = "replied";
-	
+
 	public InnerStatus status;
-	
+
 	public Optional<CallReply> replied;
 
 	public Optional<Rejected> rejected;
-	
+
 	public List<NodeSignature> signatures;
-	
-	
-    @JsonSetter("status")
-    void setStatus(JsonNode statusNode) {
-        if (statusNode != null && statusNode.isTextual()) {            
-            if(REJECTED_STATUS_VALUE.equals(statusNode.asText()))
-            {
-            	this.rejected =  Optional.of(new Rejected()); 
-            	this.replied = Optional.empty();
-            	this.status = InnerStatus.REJECTED_STATUS;
-            }
-            else if(REPLIED_STATUS_VALUE.equals(statusNode.asText()))
-            {
-            	this.replied =  Optional.of(new CallReply());  
-            	this.rejected = Optional.empty();
-            	this.status = InnerStatus.REPLIED_STATUS;       	
-            }
-        }
-    }	
-	
-    @JsonSetter("reject_code")
-    void setRejectCode(JsonNode rejectCodeNode) {
-        if (rejectCodeNode != null && rejectCodeNode.isInt()) {
-            if(this.rejected.isPresent())
-            	this.rejected.get().rejectCode = RejectCode.create(rejectCodeNode.asInt());
-            
-        }
-    }   
-    
-    @JsonSetter("reject_message")
-    void setRejectMessage(JsonNode rejectMessageNode) {
-        if (rejectMessageNode != null && rejectMessageNode.isTextual()) {
-            if(this.rejected.isPresent())
-            	this.rejected.get().rejectMessage = rejectMessageNode.asText();
-            
-        }
-    } 
-    
-    @JsonSetter("error_code")
-    void setErrorCode(JsonNode errorCodeNode) {
-        if (errorCodeNode != null && errorCodeNode.isTextual()) {
-            if(this.rejected.isPresent())
-            	this.rejected.get().errorCode = Optional.ofNullable(errorCodeNode.asText());          
-        }
-    }    
-    
-    @JsonSetter("reply")
-    void setReply(JsonNode replyNode) {
-        if (replyNode != null && replyNode.has("arg")) {
-        	JsonNode argNode = replyNode.get("arg");
-            if(this.replied.isPresent())
+
+	@JsonSetter("status")
+	void setStatus(JsonNode statusNode) {
+		if (statusNode != null && statusNode.isTextual()) {
+			if (REJECTED_STATUS_VALUE.equals(statusNode.asText())) {
+				this.rejected = Optional.of(new Rejected());
+				this.replied = Optional.empty();
+				this.status = InnerStatus.REJECTED_STATUS;
+			} else if (REPLIED_STATUS_VALUE.equals(statusNode.asText())) {
+				this.replied = Optional.of(new CallReply());
+				this.rejected = Optional.empty();
+				this.status = InnerStatus.REPLIED_STATUS;
+			}
+		}
+	}
+
+	@JsonSetter("reject_code")
+	void setRejectCode(JsonNode rejectCodeNode) {
+		if (rejectCodeNode != null && rejectCodeNode.isInt()) {
+			if (this.rejected.isPresent())
+				this.rejected.get().rejectCode = RejectCode.create(rejectCodeNode.asInt());
+
+		}
+	}
+
+	@JsonSetter("reject_message")
+	void setRejectMessage(JsonNode rejectMessageNode) {
+		if (rejectMessageNode != null && rejectMessageNode.isTextual()) {
+			if (this.rejected.isPresent())
+				this.rejected.get().rejectMessage = rejectMessageNode.asText();
+
+		}
+	}
+
+	@JsonSetter("error_code")
+	void setErrorCode(JsonNode errorCodeNode) {
+		if (errorCodeNode != null && errorCodeNode.isTextual()) {
+			if (this.rejected.isPresent())
+				this.rejected.get().errorCode = Optional.ofNullable(errorCodeNode.asText());
+		}
+	}
+
+	@JsonSetter("reply")
+	void setReply(JsonNode replyNode) {
+		if (replyNode != null && replyNode.has("arg")) {
+			JsonNode argNode = replyNode.get("arg");
+			if (this.replied.isPresent())
 				try {
 					this.replied.get().arg = argNode.binaryValue();
 				} catch (IOException e) {
 					throw AgentError.create(AgentError.AgentErrorCode.INVALID_CBOR_DATA, e);
 				}
-            
-        }
-    }  
-    
-    @JsonSetter("signatures")
-    void setSignatures(JsonNode signaturesNode) {   
-    	if (signaturesNode != null && signaturesNode.isArray())
-    	{
-    		ArrayNode arrayNode = (ArrayNode)signaturesNode;
-    		this.signatures = new ArrayList<NodeSignature>();
-    		
-    		Iterator<JsonNode> it = arrayNode.elements();
-    		
-    		while(it.hasNext())
-    		{
-    			NodeSignature nodeSignature = new NodeSignature();
-    			
-    			ObjectNode itemNode = (ObjectNode) it.next();
-    			
-    			if(itemNode.has("timestamp") && !itemNode.get("timestamp").isNull())
-    				nodeSignature.timestamp = itemNode.get("timestamp").asLong();
-    			
-    			if(itemNode.has("signature") && !itemNode.get("signature").isNull())
-    			{
+
+		}
+	}
+
+	@JsonSetter("signatures")
+	void setSignatures(JsonNode signaturesNode) {
+		if (signaturesNode != null && signaturesNode.isArray()) {
+			ArrayNode arrayNode = (ArrayNode) signaturesNode;
+			this.signatures = new ArrayList<NodeSignature>();
+
+			Iterator<JsonNode> it = arrayNode.elements();
+
+			while (it.hasNext()) {
+				NodeSignature nodeSignature = new NodeSignature();
+
+				ObjectNode itemNode = (ObjectNode) it.next();
+
+				if (itemNode.has("timestamp") && !itemNode.get("timestamp").isNull())
+					nodeSignature.timestamp = itemNode.get("timestamp").asLong();
+
+				if (itemNode.has("signature") && !itemNode.get("signature").isNull()) {
 					try {
 						nodeSignature.signature = itemNode.get("signature").binaryValue();
 					} catch (IOException e) {
 						throw AgentError.create(AgentError.AgentErrorCode.INVALID_CBOR_DATA, e);
 					}
-    			}
-    			
-    			if(itemNode.has("identity") && !itemNode.get("identity").isNull())
-    			{
+				}
+
+				if (itemNode.has("identity") && !itemNode.get("identity").isNull()) {
 					try {
 						nodeSignature.identity = Principal.from(itemNode.get("identity").binaryValue());
 					} catch (PrincipalError | IOException e) {
 						throw AgentError.create(AgentError.AgentErrorCode.INVALID_CBOR_DATA, e);
 					}
-    			}
-    			
-    			this.signatures.add(nodeSignature);
-    		}
-    	}
-    }
-    
-    public byte[] signable(RequestId requestId, long timestamp)
-    {
-    	QueryResponseSignable responseSignable = new QueryResponseSignable(this, requestId, timestamp);
-    		
-    	RequestId responseId = RequestId.toRequestId(responseSignable);
-    	try {
-    		byte[] prefix = ArrayUtils.addAll(Hex.decodeHex("0B"),"ic-response".getBytes(StandardCharsets.UTF_8));
-        	byte[] signable = ArrayUtils.addAll(prefix, responseId.get());
-        	
-        	return signable;
-		} catch (DecoderException e) {
-			throw AgentError.create(AgentError.AgentErrorCode.CUSTOM_ERROR, e);
+				}
+
+				this.signatures.add(nodeSignature);
+			}
 		}
+	}
+
+	public byte[] signable(RequestId requestId, long timestamp) {
+		QueryResponseSignable responseSignable = new QueryResponseSignable(this, requestId, timestamp);
+
+		RequestId responseId = RequestId.toRequestId(responseSignable);
+		byte[] prefix = ArrayUtils.addAll(Hex.decodeHex("0B"), "ic-response".getBytes(StandardCharsets.UTF_8));
+		byte[] signable = ArrayUtils.addAll(prefix, responseId.get());
 
-    }
+		return signable;
 
-	public final class Rejected{
+	}
+
+	public final class Rejected {
 		public RejectCode rejectCode;
 		public String rejectMessage;
 		public Optional<String> errorCode;
 	}
-	
-	public enum InnerStatus{
-		REJECTED_STATUS(REJECTED_STATUS_VALUE),
-		REPLIED_STATUS(REPLIED_STATUS_VALUE);
-		
+
+	public enum InnerStatus {
+		REJECTED_STATUS(REJECTED_STATUS_VALUE), REPLIED_STATUS(REPLIED_STATUS_VALUE);
+
 		String value;
 
 		InnerStatus(String value) {
@@ -183,6 +168,5 @@ public enum InnerStatus{
 		}
 
 	}
-	
 
 }
diff --git a/src/main/java/org/ic4j/agent/requestid/RequestId.java b/src/main/java/org/ic4j/agent/requestid/RequestId.java
index 2e2d87f..bf22138 100644
--- a/src/main/java/org/ic4j/agent/requestid/RequestId.java
+++ b/src/main/java/org/ic4j/agent/requestid/RequestId.java
@@ -16,8 +16,7 @@
 
 package org.ic4j.agent.requestid;
 
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
+import org.ic4j.agent.Hex;
 import org.ic4j.agent.Serialize;
 
 public final class RequestId {
@@ -65,14 +64,10 @@ public static RequestId fromHex(byte[] value)
 	public static RequestId fromHexString(String hexValue) 
 	{
 
-		try {
 			if(hexValue == null)
 				throw RequestIdError.create(RequestIdError.RequestIdErrorCode.EMPTY_SERIALIZER);
 			
-			return new RequestId((Hex.decodeHex(hexValue.toCharArray())));
-		} catch (DecoderException e) {
-			throw RequestIdError.create(RequestIdError.RequestIdErrorCode.CUSTOM_SERIALIZER_ERROR, e, e.getLocalizedMessage());
-		}
+			return new RequestId((Hex.decodeHex(hexValue)));
 	}	
 	
 	public byte[] get()
diff --git a/src/main/java/org/ic4j/agent/requestid/RequestIdSerializer.java b/src/main/java/org/ic4j/agent/requestid/RequestIdSerializer.java
index 01bf47c..fbfe263 100644
--- a/src/main/java/org/ic4j/agent/requestid/RequestIdSerializer.java
+++ b/src/main/java/org/ic4j/agent/requestid/RequestIdSerializer.java
@@ -26,10 +26,9 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.commons.codec.digest.DigestUtils;
+import org.ic4j.agent.DigestUtils;
 import org.ic4j.agent.Serialize;
 import org.ic4j.agent.Serializer;
-import org.ic4j.candid.ByteUtils;
 import org.ic4j.candid.Leb128;
 import org.ic4j.types.Principal;
 import org.slf4j.Logger;
@@ -71,7 +70,7 @@ else if (value instanceof byte[])
 		else
 			bytes = value.toString().getBytes();
 
-		byte[] result	=	DigestUtils.sha256(bytes);
+		byte[] result	= DigestUtils.sha256(bytes);
 		
 		return result;
 	}
diff --git a/src/test/java/org/ic4j/agent/test/HelloProxy.java b/src/test/java/org/ic4j/agent/test/HelloProxy.java
index 879f515..cb3e05c 100644
--- a/src/test/java/org/ic4j/agent/test/HelloProxy.java
+++ b/src/test/java/org/ic4j/agent/test/HelloProxy.java
@@ -23,8 +23,8 @@
 import org.ic4j.types.Func;
 
 @Agent(identity = @Identity(type = IdentityType.BASIC, pem_file = "./src/test/resources/Ed25519_identity.pem"), transport = @Transport(url = "https://icp-api.io/"))
-@Canister("3m5ej-xiaaa-aaaab-qacpa-cai")
-@EffectiveCanister("3m5ej-xiaaa-aaaab-qacpa-cai")
+@Canister("zwbmv-jyaaa-aaaab-qacaa-cai")
+@EffectiveCanister("zwbmv-jyaaa-aaaab-qacaa-cai")
 public interface HelloProxy {
 	
 	@Modes(Mode.QUERY)
diff --git a/src/test/java/org/ic4j/agent/test/LoanTest.java b/src/test/java/org/ic4j/agent/test/LoanTest.java
index e4d26eb..1947521 100644
--- a/src/test/java/org/ic4j/agent/test/LoanTest.java
+++ b/src/test/java/org/ic4j/agent/test/LoanTest.java
@@ -56,6 +56,10 @@ public void test() {
 
 		Agent agent = new AgentBuilder().transport(transport).nonceFactory(new NonceFactory())
 				.build();
+		
+		boolean local = false;
+		if(local)
+			agent.fetchRootKey();
 				
 		
 		// Get Loan Offer Request	
diff --git a/src/test/resources/test.properties b/src/test/resources/test.properties
index f3769ea..f1d1e13 100644
--- a/src/test/resources/test.properties
+++ b/src/test/resources/test.properties
@@ -9,8 +9,8 @@ storePath=/tmp
 icUrl=https://icp-api.io/
 //icUrl=http://localhost:8000
 //icUrl=http://192.168.0.145:9090/
-icCanisterId=3m5ej-xiaaa-aaaab-qacpa-cai
-//loanUrl=https://m7sm4-2iaaa-aaaab-qabra-cai.ic0.app/
+icCanisterId=zwbmv-jyaaa-aaaab-qacaa-cai
+//loanUrl=http://127.0.0.1:4943/
 loanUrl=https://icp-api.io/
-loanCanisterId=3l4c5-2qaaa-aaaab-qacpq-cai
+loanCanisterId=omnp4-sqaaa-aaaab-qab7q-cai
 transportType=http.apache