diff --git a/README.md b/README.md
index 8d23909..f37c1b1 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,10 @@
 Cardano Data Lite (CDL) aims to be a drop in replacement for Cardano Serialization Library (CSL).
 CDL is written in Typescript and compiled to Javascript with minimal dependencies. There are no WASM blobs resulting in much smaller bundle size. CDL is also easier to integrate with various bundlers which lack the ability to load WASM, like ESBuild where top-level await is not available.
 
+## Documentation
+
+[See here](docs.md)
+
 # Development
 
 Due to the size of CSL and also the fact that CSL was undergoing constant updates while we were developing CDL, we designed a small DSL to describe the behaviour of CSL types and used that to dynamically generate a Typescript port of CSL.
@@ -12,7 +16,7 @@ The DSL can be found at `/conway-cddl/yaml` and the code that interprets it can
 
 To measure the progress of implementation, we use automated test suite that parses the type definitions of both CSL and CDL and compares them for compatibility.
 
-To run these, run:
+To run these, run the following from the project root directory:
 
 ```
 npm run test-api
diff --git a/conway-cddl/codegen/generators/structured/index.ts b/conway-cddl/codegen/generators/structured/index.ts
index e0dfc5f..9b077a1 100644
--- a/conway-cddl/codegen/generators/structured/index.ts
+++ b/conway-cddl/codegen/generators/structured/index.ts
@@ -23,7 +23,7 @@ export class GenStructuredBase<
   constructor(
     name: string,
     customTypes: SchemaTable,
-    options: GenStructuredBaseOptions<Field>,
+    options: GenStructuredBaseOptions<Field>
   ) {
     super(name, customTypes, options);
     this.options = options;
@@ -63,7 +63,7 @@ export class GenStructuredBase<
             .map((x) => x.name)
             .join(",")});
         }
-      `,
+      `
       )}
     `;
   }
@@ -72,14 +72,22 @@ export class GenStructuredBase<
     return this.getFields()
       .map(
         (x) => `
-        ${this.accessorGetPrefix ? "get_" : ""}${x.name}(): ${this.fieldType(x)} {
-          return this._${x.name};
-        }
+        ${this.renameMethod(
+          this.accessorGetPrefix ? `get_${x.name}` : x.name,
+          (get) => ` 
+            ${get}(): ${this.fieldType(x)} {
+              return this._${x.name};
+            }`
+        )}
 
-        set_${x.name}(${x.name}: ${this.fieldType(x)}): void {
-          this._${x.name} = ${x.name};
-        }
-      `,
+        ${this.renameMethod(
+          `set_${x.name}`,
+          (set) => `
+            ${set}(${x.name}: ${this.fieldType(x)}): void {
+              this._${x.name} = ${x.name};
+            }`
+        )}
+      `
       )
       .join("\n");
   }
diff --git a/conway-cddl/yaml/conway.yaml b/conway-cddl/yaml/conway.yaml
index e129f79..5845078 100644
--- a/conway-cddl/yaml/conway.yaml
+++ b/conway-cddl/yaml/conway.yaml
@@ -64,6 +64,21 @@ Transaction:
     - name: auxiliary_data
       type: AuxiliaryData
       nullable: true
+  methods:
+    new: null
+  extra_methods: |
+    static new(
+      body: TransactionBody,
+      witness_set: TransactionWitnessSet,
+      auxiliary_data: AuxiliaryData
+    ): Transaction {
+      return new Transaction(
+        body, 
+        witness_set, 
+        true, 
+        auxiliary_data
+      );
+    }
 
 # transaction_index = uint .size 2
 
@@ -96,7 +111,7 @@ HeaderBody:
   fields:
     - name: block_number
       type: number
-    - name: slot_bignum
+    - name: slot
       type: BigNum
     - name: prev_hash
       type: BlockHash
@@ -115,18 +130,29 @@ HeaderBody:
       type: OperationalCert
     - name: protocol_version
       type: ProtocolVersion
+  methods:
+    slot: slot_bignum
+    new: new_headerbody
   extra_methods: |
     slot(): number  {
-      return Number(this._slot_bignum);
+      return this.slot_bignum()._to_number();
     }
 
-    static new_headerbody(block_number: number, slot: BigNum, prev_hash:
-      BlockHash | undefined, issuer_vkey: Vkey, vrf_vkey: VRFVKey, vrf_result:
-      VRFCert, block_body_size: number, block_body_hash: BlockHash,
-      operational_cert: OperationalCert, protocol_version: ProtocolVersion): HeaderBody {
+    static new(
+      block_number: number, 
+      slot: number, 
+      prev_hash: BlockHash | undefined, 
+      issuer_vkey: Vkey, 
+      vrf_vkey: VRFVKey, 
+      vrf_result: VRFCert, 
+      block_body_size: number, 
+      block_body_hash: BlockHash,
+      operational_cert: OperationalCert, 
+      protocol_version: ProtocolVersion
+    ): HeaderBody {
       return new HeaderBody(
         block_number,
-        slot,
+        BigNum._from_number(slot),
         prev_hash,
         issuer_vkey,
         vrf_vkey,
@@ -203,11 +229,9 @@ TransactionBody:
       name: fee
       type: BigNum
     - id: 3
-      name: ttl_bignum
+      name: ttl
       type: BigNum
       optional: true
-      flags:
-        - as_number
     - id: 4
       name: certs
       type: Certificates
@@ -221,7 +245,7 @@ TransactionBody:
       type: AuxiliaryDataHash
       optional: true
     - id: 8
-      name: validity_start_interval_bignum
+      name: validity_start_interval
       type: BigNum
       optional: true
     - id: 9
@@ -272,32 +296,41 @@ TransactionBody:
       name: donation
       type: BigNum
       optional: true
+  methods:
+    ttl: ttl_bignum
+    validity_start_interval: validity_start_interval_bignum
+    set_validity_start_interval: set_validity_start_interval_bignum
+    new: null
   extra_methods: |
     ttl(): number | undefined {
-      if (this._ttl_bignum === undefined) return undefined;
-      return Number(this._ttl_bignum);
-    }
-    set_ttl(ttl: BigNum): void {
-      this._ttl_bignum = ttl;
+      return this.ttl_bignum()?._to_number();
     }
+
     remove_ttl(): void {
-      this._ttl_bignum = undefined;
+      this.set_ttl(undefined);
     }
 
     validity_start_interval(): number | undefined {
-      if (this._validity_start_interval_bignum === undefined) return undefined;
-      return Number(this._validity_start_interval_bignum);
+      return this.validity_start_interval_bignum()?._to_number();
     }
-    set_validity_start_interval(validity_start_interval: number): void {
-      this._validity_start_interval_bignum = BigNum.new(BigInt(validity_start_interval));
+
+    set_validity_start_interval(validity_start_interval: number) {
+      return this.set_validity_start_interval_bignum(
+        BigNum._from_number(validity_start_interval)
+      );
     }
 
-    static new_tx_body(inputs: TransactionInputs, outputs: TransactionOutputs, fee: BigNum): TransactionBody {
-      return TransactionBody.new(
+    static new(
+      inputs: TransactionInputs, 
+      outputs: TransactionOutputs, 
+      fee: BigNum,
+      ttl?: number,
+    ): TransactionBody {
+      return new TransactionBody(
         inputs.clone(),
         outputs.clone(),
         fee,
-        undefined,
+        ttl != null ? BigNum._from_number(ttl) : undefined,
         undefined,
         undefined,
         undefined,
@@ -315,7 +348,15 @@ TransactionBody:
         undefined,
         undefined,
       );
-     }
+    }
+
+    static new_tx_body(
+      inputs: TransactionInputs, 
+      outputs: TransactionOutputs, 
+      fee: BigNum,
+    ): TransactionBody {
+      return TransactionBody.new(inputs, outputs, fee, undefined);
+    }
 
 TransactionInputs:
   type: set
@@ -345,6 +386,12 @@ VotingProcedure:
     - name: anchor
       type: Anchor
       nullable: true
+  methods:
+    new: new_with_anchor
+  extra_methods: |
+    static new(vote: VoteKind): VotingProcedure {
+      return new VotingProcedure(vote, undefined);
+    }
 
 # proposal_procedure =
 #   [ deposit : coin
@@ -363,6 +410,22 @@ VotingProposal:
       type: GovernanceAction
     - name: anchor
       type: Anchor
+  methods:
+    new: null
+  extra_methods: |
+    static new(
+      governance_action: GovernanceAction, 
+      anchor: Anchor, 
+      reward_account: RewardAddress, 
+      deposit: BigNum
+    ): VotingProposal {
+      return new VotingProposal(
+        deposit, 
+        reward_account, 
+        governance_action, 
+        anchor
+      )
+    }
 
 # proposal_procedures = nonempty_oset<proposal_procedure>
 VotingProposals:
@@ -428,6 +491,38 @@ ParameterChangeAction:
     - name: policy_hash
       type: ScriptHash
       nullable: true
+  methods:
+    new: new_with_policy_hash_and_action_id
+  extra_methods: |
+    static new(
+      protocol_param_updates: ProtocolParamUpdate
+    ): ParameterChangeAction {
+      return new ParameterChangeAction(
+        undefined, 
+        protocol_param_updates, 
+        undefined
+      );
+    }
+    static new_with_action_id(
+      gov_action_id: GovernanceActionId, 
+      protocol_param_updates: ProtocolParamUpdate
+    ): ParameterChangeAction {
+      return new ParameterChangeAction(
+        gov_action_id, 
+        protocol_param_updates, 
+        undefined
+      );
+    }
+    static new_with_policy_hash(
+      protocol_param_updates: ProtocolParamUpdate,
+      policy_hash: ScriptHash
+    ): ParameterChangeAction {
+      return new ParameterChangeAction(
+        undefined, 
+        protocol_param_updates, 
+        policy_hash
+      );
+    }
 
 HardForkInitiationAction:
   type: record_fragment
@@ -437,6 +532,12 @@ HardForkInitiationAction:
       nullable: true
     - name: protocol_version
       type: ProtocolVersion
+  methods:
+    new: new_with_action_id
+  extra_methods: |
+    static new(protocol_version: ProtocolVersion): HardForkInitiationAction {
+      return new HardForkInitiationAction(undefined, protocol_version);
+    }
 
 TreasuryWithdrawalsAction:
   type: record_fragment
@@ -446,6 +547,12 @@ TreasuryWithdrawalsAction:
     - name: policy_hash
       type: ScriptHash
       nullable: true
+  methods:
+    new: new_with_policy_hash
+  extra_methods: |
+    static new(withdrawals: TreasuryWithdrawals): TreasuryWithdrawalsAction {
+      return new TreasuryWithdrawalsAction(withdrawals, undefined);
+    }
 
 NoConfidenceAction:
   type: record_fragment
@@ -453,6 +560,12 @@ NoConfidenceAction:
     - name: gov_action_id
       type: GovernanceActionId
       nullable: true
+  methods:
+    new: new_with_action_id
+  extra_methods: |
+    static new(): NoConfidenceAction {
+      return new NoConfidenceAction(undefined);
+    }
 
 NewConstitutionAction:
   type: record_fragment
@@ -462,6 +575,12 @@ NewConstitutionAction:
       nullable: true
     - name: constitution
       type: Constitution
+  methods:
+    new: new_with_action_id
+  extra_methods: |
+    static new(constitution: Constitution): NewConstitutionAction {
+      return new NewConstitutionAction(undefined, constitution);
+    }
 
 InfoAction:
   type: record_fragment
@@ -483,6 +602,12 @@ Constitution:
     - name: scripthash
       type: ScriptHash
       nullable: true
+  methods:
+    new: null
+  extra_methods: |
+    static new(anchor: Anchor): Constitution {
+      return new Constitution(anchor, undefined);
+    }
 
 Voters:
   type: array
@@ -577,6 +702,12 @@ TransactionOutput:
       name: script_ref
       type: ScriptRef
       optional: true
+  methods:
+    new: null
+  extra_methods: |
+    static new(address: Address, amount: Value): TransactionOutput {
+      return new TransactionOutput(address, amount, undefined, undefined);
+    }
 
 # script_data_hash = $hash32
 # ; This is a hash of data which may affect evaluation of a script.
@@ -896,6 +1027,12 @@ CommitteeColdResign:
     - name: anchor
       type: Anchor
       nullable: true
+  methods:
+    new: null
+  extra_methods: |
+    static new(committee_cold_credential: Credential): CommitteeColdResign {
+      return new CommitteeColdResign(committee_cold_credential, undefined);
+    }
 
 DRepRegistration:
   type: record_fragment
@@ -907,6 +1044,12 @@ DRepRegistration:
     - name: anchor
       type: Anchor
       nullable: true
+  methods:
+    new: null
+  extra_methods: |
+    static new(voting_credential: Credential, coin: BigNum): DRepRegistration {
+      return new DRepRegistration(voting_credential,coin, undefined);
+    }
 
 DRepDeregistration:
   type: record_fragment
@@ -924,6 +1067,12 @@ DRepUpdate:
     - name: anchor
       type: Anchor
       nullable: true
+  methods:
+    new: null
+  extra_methods: |
+    static new(drep_credential: Credential): DRepUpdate {
+      return new DRepUpdate(drep_credential, undefined);
+    }
 
 # delta_coin = int
 
@@ -1376,6 +1525,21 @@ TransactionWitnessSet:
       name: plutus_scripts_v3
       type: PlutusScripts
       optional: true
+  methods:
+    new: null
+  extra_methods: |
+    static new(): TransactionWitnessSet {
+      return new TransactionWitnessSet(
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+      );
+    }
 
 Vkeywitnesses:
   type: set
@@ -1391,7 +1555,20 @@ BootstrapWitnesses:
 
 PlutusScripts:
   type: array
+  item: PlutusScript
+
+PlutusScript:
+  type: newtype
   item: bytes
+  accessor: bytes
+  extra_methods: |
+    hash(language_version: number): ScriptHash {
+      let bytes = new Uint8Array(this.bytes().length + 1);
+      bytes[0] = language_version;
+      bytes.set(bytes, 1);
+      let hash_bytes = cdlCrypto.blake2b224(bytes);
+      return new ScriptHash(hash_bytes);
+    }
 
 PlutusList:
   type: set
@@ -1565,6 +1742,18 @@ AuxiliaryData:
     - id: 4
       name: plutus_scripts_v3
       type: PlutusScripts
+  methods:
+    new: null
+  extra_methods: |
+    static new(): AuxiliaryData {
+      return new AuxiliaryData(
+        GeneralTransactionMetadata.new(),
+        NativeScripts.new(),
+        PlutusScripts.new(),
+        PlutusScripts.new(),
+        PlutusScripts.new(),
+      )
+    }
 
 # vkeywitness = [ $vkey, $signature ]
 Vkeywitness:
@@ -1667,29 +1856,35 @@ ScriptNOfK:
 TimelockStart:
   type: record_fragment
   fields:
-    - name: slot_bignum
+    - name: slot
       type: BigNum
+  methods:
+    new: new_timelockstart
+    slot: slot_bignum
   extra_methods: |
     slot(): number  {
-      return Number(this._slot_bignum);
+      return this.slot_bignum()._to_number();
     }
 
-    static new_timelockexpiry(slot: BigNum): TimelockExpiry {
-      return new TimelockExpiry(slot);
+    static new(slot: number): TimelockStart {
+      return new TimelockStart(BigNum._from_number(slot));
     }
 
 TimelockExpiry:
   type: record_fragment
   fields:
-    - name: slot_bignum
+    - name: slot
       type: BigNum
+  methods:
+    new: new_timelockexpiry
+    slot: slot_bignum
   extra_methods: |
     slot(): number  {
-      return Number(this._slot_bignum);
+      return this.slot_bignum()._to_number();
     }
 
-    static new_timelockexpiry(slot: BigNum): TimelockExpiry {
-      return new TimelockExpiry(slot);
+    static new(slot: number): TimelockExpiry {
+      return new TimelockExpiry(BigNum._from_number(slot));
     }
 
 # coin = uint
@@ -1764,10 +1959,9 @@ DataOption:
       value: DataHash
     - name: data
       tag: 1
-      value: PlutusData # TODO: Encode as #6.24(bytes)
+      value: PlutusData
 
 # script_ref = #6.24(bytes .cbor script)
-# TODO: Custom
 
 # script = [ 0, native_script // 1, plutus_v1_script // 2, plutus_v2_script // 3, plutus_v3_script ]
 ScriptRef:
@@ -1778,15 +1972,15 @@ ScriptRef:
       value: NativeScript
     - name: plutus_script_v1
       tag: 1
-      value: bytes
+      value: PlutusScript
       kind_name: PlutusScriptV1
     - name: plutus_script_v2
       tag: 2
-      value: bytes
+      value: PlutusScript
       kind_name: PlutusScriptV2
     - name: plutus_script_v3
       tag: 3
-      value: bytes
+      value: PlutusScript
       kind_name: PlutusScriptV3
 
 UnitInterval:
@@ -1823,10 +2017,6 @@ PlutusMapValues:
   type: array
   item: PlutusData
 
-PlutusWitnesses:
-  type: array
-  item: PlutusWitness
-
 TreasuryWithdrawals:
   type: map
   key: RewardAddress
diff --git a/conway-cddl/yaml/custom/bignum.yaml b/conway-cddl/yaml/custom/bignum.yaml
index 99237a0..68df3c1 100644
--- a/conway-cddl/yaml/custom/bignum.yaml
+++ b/conway-cddl/yaml/custom/bignum.yaml
@@ -79,3 +79,11 @@ BigNum:
       if(a.toJsValue() > b.toJsValue()) return a;
       else return b;
     }
+
+    static _from_number(x: number): BigNum {
+      return new BigNum(BigInt(x))
+    }
+
+    _to_number(): number {
+      return Number(this.toJsValue);
+    }
diff --git a/conway-cddl/yaml/custom/hash.yaml b/conway-cddl/yaml/custom/hash.yaml
index 1d38478..d3404c6 100644
--- a/conway-cddl/yaml/custom/hash.yaml
+++ b/conway-cddl/yaml/custom/hash.yaml
@@ -65,6 +65,27 @@ KESVKey:
 Ed25519Signature:
   type: hash
   len: 64
+  methods:
+    to_bech32: null
+    from_bech32: null
+  extra_methods: |
+    static _BECH32_HRP = "ed25519_sk";
+    static from_bech32(bech_str: string): Ed25519Signature {
+      let decoded = bech32.decode(bech_str);
+      let words = decoded.words;
+      let bytesArray = bech32.fromWords(words);
+      let bytes = new Uint8Array(bytesArray);
+      if(decoded.prefix==Ed25519Signature._BECH32_HRP) {
+        return new Ed25519Signature(bytes);
+      } else {
+        throw new Error("Invalid prefix for Ed25519Signature: " + decoded.prefix);
+      }
+    }
+
+    to_bech32() {
+      let prefix = Ed25519Signature._BECH32_HRP;
+      bech32.encode(prefix, this.inner);
+    }
 
 KESSignature:
   type: newtype
diff --git a/conway-cddl/yaml/custom/plutus_witness.yaml b/conway-cddl/yaml/custom/plutus_witness.yaml
deleted file mode 100644
index 5141246..0000000
--- a/conway-cddl/yaml/custom/plutus_witness.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-PlutusWitness:
-  type: record
-  fields:
-    - name: script_source
-      type: PlutusScriptSource
-    - name: datum_source
-      type: DatumSource
-      nullable: true
-    - name: redeemer
-      type: Redeemer
-  methods:
-    new: null
-  extra_methods: |
-    static new(script: Uint8Array, datum: PlutusData, redeemer: Redeemer): PlutusWitness {
-      return new PlutusWitness(PlutusScriptSource.new(script), DatumSource.new(datum), redeemer);
-    }
-    static new_with_ref(script: PlutusScriptSource, datum: DatumSource, redeemer: Redeemer): PlutusWitness {
-      return new PlutusWitness(script, datum, redeemer);
-    }
-    static new_without_datum(script: Uint8Array, redeemer: Redeemer): PlutusWitness {
-      return new PlutusWitness(PlutusScriptSource.new(script), undefined, redeemer);
-    }
-    static new_with_ref_without_datum(script: PlutusScriptSource, redeemer: Redeemer): PlutusWitness {
-      return new PlutusWitness(script, undefined, redeemer);
-    }
-    script(): Uint8Array | undefined {
-      return this._script_source.as_script();
-    }
-    datum(): PlutusData | undefined {
-      if (this._datum_source === undefined) return undefined;
-      return this._datum_source.as_datum()
-    }
diff --git a/csl-types/csl-api-differences.txt b/csl-types/csl-api-differences.txt
deleted file mode 100644
index fc18b9a..0000000
--- a/csl-types/csl-api-differences.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Certificate.Kind:
-	CSL crams the RegCert and StakeRegistration into a single class StakeRegistration.
-	Same for UnregCert and StakeDeregistration.
-	The API to construct the Certificate type still has separate constructor for these, 
-	so users who construct, deconstruct and otherwise interact with the Certificate type is unaffected.
-	But user's who inspect the value of Certificate.kind() will see that CSL has the same value for some variants,
-	while CDL has unique values for each variant.
-
-	We decided to do it this way because it's easier to reason about and maintain.
-	They are distinct types in conway.cddl as well.
-	In addition, we are API compatible with CSL except for the kind() method.
-
-PointerAddress:
-	We have removed support for PointerAddress because CSL doesn't use them and
-	generally it's rarely used. We will add this later if needed.
diff --git a/docs.md b/docs.md
new file mode 100644
index 0000000..84fb5c2
--- /dev/null
+++ b/docs.md
@@ -0,0 +1,79 @@
+### Documentation
+
+Cardano Data Lite aims to be as API compatible with Cardano Serialization Library as possible.
+
+So the original documentation for CSL can be used as-is:
+https://developers.cardano.org/docs/get-started/cardano-serialization-lib/overview/
+
+There are some rare cases where we had to differ from CSL API. Documentation for those parts and the motivation for the differences are noted below.
+
+## Changes from from CSL
+
+The following sections outline key differences in the API between the Cardano Data Lite (CDL) and the Cardano Serialization Library (CSL).
+
+### `Certificate.Kind`:
+
+CSL crams the `RegCert` and `StakeRegistration` functionalities into a single class `StakeRegistration`.
+Same for `UnregCert` and `StakeDeregistration`.
+The API to construct the `Certificate` type still has separate constructor for
+these, so users who construct, deconstruct and otherwise interact with the
+`Certificate` type is unaffected.
+But users who inspect the value of `Certificate.kind()` will see that CSL doesn't have an entry for the `RegCert` or `UnregCert` variant, while CDL does.
+
+We decided to do it this way because they are distinct types in conway.cddl and it's easier to think of them as separate types.
+
+Regardless, we are API compatible with CSL except for the `kind()` method.
+
+### `PointerAddress`:
+
+We have removed support for `PointerAddress` because CTL doesn't use them and
+generally it's rarely used. We will add this later if needed.
+
+### `PlutusScripts`:
+
+We differ from CSL API where CSL has:
+
+```
+TransactionWitnessSet:
+    - plutus_scripts: PlutusScripts
+PlutusScripts: Array of PlutusScript
+PlutusScript:
+    language_version: number
+    bytes: Uint8Array
+```
+
+The issue here is that the following assertion doesn't hold:
+
+```
+let plutus_scripts_a = ...;
+let plutus_scripts_b = PlutusScripts.from_hex(plutus_scripts.to_hex());
+
+assert(plutus_scripts_a.to_hex() == plutus_scripts_b.to_hex())
+```
+
+The `to_hex()` method has no way of encoding language version because the Conway CDDL spec doesn't have a field for encoding language version.
+
+Instead, the Conway CDDL spec has:
+
+```
+transaction_witness_set =
+    { ..
+    , ? 3: nonempty_set<plutus_v1_script>
+    , ? 6: nonempty_set<plutus_v2_script>
+    , ? 7: nonempty_set<plutus_v3_script>
+    }
+```
+
+A script is considered v1 or v2 depending on which field it's put in.
+
+We adapted the API to more closely follow the Conway CDDL spec.
+
+```
+TransactionWitnessSet:
+    - plutus_script_v1: PlutusScripts
+    - plutus_script_v2: PlutusScripts
+    - plutus_script_v3: PlutusScripts
+PlutusScripts: Array of Uint8Array
+```
+
+Here the previous assertion holds. We uphold the contract that `Foo.from_hex(foo.to_hex())` and `Foo.from_bytes(foo.to_bytes())` are identical to `foo`.
diff --git a/src/address/malformed.ts b/src/address/malformed.ts
index e10cfea..b812985 100644
--- a/src/address/malformed.ts
+++ b/src/address/malformed.ts
@@ -11,7 +11,7 @@ export class MalformedAddress {
     return new Uint8Array(this._bytes);
   }
 
-  from_address(addr: Address): MalformedAddress | undefined {
+  static from_address(addr: Address): MalformedAddress | undefined {
     if (addr._variant.kind == AddressKind.Malformed) {
       return addr._variant.value;
     }
diff --git a/tests/api/api.test.ts b/tests/api/api.test.ts
index 8d462c2..36f5d8f 100644
--- a/tests/api/api.test.ts
+++ b/tests/api/api.test.ts
@@ -212,8 +212,8 @@ for(const rename of classRenames) {
 
 // We filter out the ignored classes from clsClassesMap based on the classInfo file.
 // We don't want to fail when checking methods if cdlClassesMap does not contain these classes.
-const classInfo: { ignore: Array<string> } = JSON.parse(fs.readFileSync("csl-types/class-info.json", "utf-8"));
-for (const cls of classInfo.ignore) {
+const classInfo: { ignore_classes: Array<string> } = JSON.parse(fs.readFileSync("tests/class-info.json", "utf-8"));
+for (const cls of classInfo.ignore_classes) {
   cslClassesMap.delete(cls);
 }
 
diff --git a/csl-types/class-info.json b/tests/class-info.json
similarity index 69%
rename from csl-types/class-info.json
rename to tests/class-info.json
index 964cd40..b0f4d75 100644
--- a/csl-types/class-info.json
+++ b/tests/class-info.json
@@ -1,5 +1,5 @@
 {
-  "ignore": [
+  "ignore_classes": [
     "GenesisKeyDelegation",
     "MoveInstantaneousReward",
     "MoveInstantaneousRewardsCert",
@@ -21,6 +21,16 @@
     "TransactionUnspentOutputs",
     "TransactionBatch",
     "TransactionBatchList",
-    "PlutusScript"
-  ]
+    "PlutusWitness",
+    "PlutusWitnesses"
+  ],
+  "ignore_methods": {
+    "Certificate": [
+      "new_reg_cert",
+      "new_unreg_cert",
+      "as_reg_cert",
+      "as_unreg_cert"
+    ],
+    "PlutusScript": ["hash"]
+  }
 }
diff --git a/tsconfig.json b/tsconfig.json
index 539e452..037e207 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "@tsconfig/recommended/tsconfig.json",
   "include": ["src/**/*"],
-  "exclude": ["src/generated/out-unformatted.ts"],
+  "exclude": ["src/generated-unformatted.ts"],
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig to read more about this file */
     /* Projects */