diff --git a/src/address.spec.ts b/src/address.spec.ts
index 63abaa51..48313ab0 100644
--- a/src/address.spec.ts
+++ b/src/address.spec.ts
@@ -55,4 +55,16 @@ describe("test address", () => {
         assert.isFalse(Address.isValid("xerd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz"));
         assert.isFalse(Address.isValid("erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2"));
     });
+
+    it("should check whether isSmartContract", () => {
+        assert.isFalse(
+            Address.fromBech32("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th").isSmartContract(),
+        );
+        assert.isTrue(
+            Address.fromBech32("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqplllst77y4l").isSmartContract(),
+        );
+        assert.isTrue(
+            Address.fromBech32("erd1qqqqqqqqqqqqqpgqxwakt2g7u9atsnr03gqcgmhcv38pt7mkd94q6shuwt").isSmartContract(),
+        );
+    });
 });
diff --git a/src/address.ts b/src/address.ts
index 9745ac9c..a5b3fda5 100644
--- a/src/address.ts
+++ b/src/address.ts
@@ -110,12 +110,12 @@ export class Address {
             throw new errors.ErrAddressCannotCreate(value, err);
         }
 
-        let prefix = decoded.prefix;
+        const prefix = decoded.prefix;
         if (prefix != HRP) {
             throw new errors.ErrAddressBadHrp(HRP, prefix);
         }
 
-        let pubkey = Buffer.from(bech32.fromWords(decoded.words));
+        const pubkey = Buffer.from(bech32.fromWords(decoded.words));
         if (pubkey.length != PUBKEY_LENGTH) {
             throw new errors.ErrAddressCannotCreate(value);
         }
@@ -194,6 +194,14 @@ export class Address {
         return Buffer.from(this.valueHex, "hex");
     }
 
+    /**
+     * Returns the human-readable-part of the bech32 addresses.
+     * The HRP is currently hardcoded to "erd".
+     */
+    getHrp(): string {
+        return HRP;
+    }
+
     /**
      * Returns whether the address is empty.
      */
@@ -216,7 +224,7 @@ export class Address {
      * Returns the bech32 representation of the address
      */
     toString(): string {
-        return this.bech32();
+        return this.toBech32();
     }
 
     /**
@@ -224,8 +232,8 @@ export class Address {
      */
     toJSON(): object {
         return {
-            bech32: this.bech32(),
-            pubkey: this.hex(),
+            bech32: this.toBech32(),
+            pubkey: this.toHex(),
         };
     }
 
@@ -241,13 +249,13 @@ export class Address {
      * Use {@link isSmartContract} instead.
      */
     isContractAddress(): boolean {
-        return this.hex().startsWith(SMART_CONTRACT_HEX_PUBKEY_PREFIX);
+        return this.isSmartContract();
     }
 
     /**
      * Returns whether the address is a smart contract address.
      */
     isSmartContract(): boolean {
-        return this.isContractAddress();
+        return this.toHex().startsWith(SMART_CONTRACT_HEX_PUBKEY_PREFIX);
     }
 }