diff --git a/index.d.ts b/index.d.ts
index 1ec6555..cad7e0e 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -10,226 +10,233 @@ declare global {
     /**
      * Documentation for this API is available at https://docs.arconnect.io
      */
-    arweaveWallet: {
-      /**
-       * Name of the wallet the API was provided by.
-       */
-      walletName: string;
-
-      /**
-       * Semver type version of the wallet
-       */
-      walletVersion: string;
-
-      /**
-       * Connect to ArConnect and request permissions. This function can always be
-       * called again if you want to request more permissions for your site.
-       *
-       * @param permissions
-       * @param appInfo
-       */
-      connect(
-        permissions: PermissionType[],
-        appInfo?: AppInfo,
-        gateway?: GatewayConfig
-      ): Promise<void>;
-
-      /**
-       * Disconnect from ArConnect. Removes all permissions from your site.
-       */
-      disconnect(): Promise<void>;
-
-      /**
-       * Get the currently used wallet's address in the extension.
-       *
-       * @returns Promise of wallet address string
-       */
-      getActiveAddress(): Promise<string>;
-
-      /**
-       * Get all addresses added to the ArConnect extension
-       *
-       * @returns Promise of a list of the added wallets' addresses.
-       */
-      getAllAddresses(): Promise<string[]>;
-
-      /**
-       * Get wallet names for addresses.
-       *
-       * @returns Promise of an object with addresses and wallet names
-       */
-      getWalletNames(): Promise<{ [addr: string]: string }>;
-
-      /**
-       * Sign a transaction.
-       *
-       * @param transaction A valid Arweave transaction without a wallet keyfile added to it
-       * @param options Arweave signing options
-       *
-       * @returns Promise of a signed transaction instance
-       */
-      sign(
-        transaction: Transaction,
-        options?: SignatureOptions
-      ): Promise<Transaction>;
-
-      /**
-       * Get the permissions allowed for you site by the user.
-       *
-       * @returns Promise of a list of permissions allowed for your dApp.
-       */
-      getPermissions(): Promise<PermissionType[]>;
-
-      /**
-       * Encrypt a string, using the user's wallet.
-       *
-       * @param data String to encrypt
-       * @param options Encrypt options
-       *
-       * @returns Promise of the encrypted string
-       */
-      encrypt(
-        data: string,
-        options: {
-          algorithm: string;
-          hash: string;
-          salt?: string;
-        }
-      ): Promise<Uint8Array>;
-
-      /**
-       * Decrypt a string encrypted with the user's wallet.
-       *
-       * @param data `Uint8Array` data to decrypt to a string
-       * @param options Decrypt options
-       *
-       * @returns Promise of the decrypted string
-       */
-      decrypt(
-        data: Uint8Array,
-        options: {
-          algorithm: string;
-          hash: string;
-          salt?: string;
-        }
-      ): Promise<string>;
-
-      /**
-       * Get the user's custom Arweave config set in the extension
-       *
-       * @returns Promise of the user's Arweave config
-       */
-      getArweaveConfig(): Promise<{
-        host: string;
-        port: number;
-        protocol: "http" | "https";
-      }>;
-
-      /**
-       * @deprecated Find alternatives at https://docs.arconnect.io/api/signature
-       */
-      signature(
-        data: Uint8Array,
-        // https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/sign#parameters
-        algorithm: AlgorithmIdentifier | RsaPssParams | EcdsaParams
-      ): Promise<Uint8Array>;
-
-      /**
-       * Get the user's active public key, from their wallet
-       *
-       * @returns Promise of the active public key
-       */
-      getActivePublicKey(): Promise<string>;
-
-      /**
-       * Add a token to ArConnect (if it is not already present)
-       *
-       * @param id Token contract ID
-       * @param type Type of the token (asset or collectible)
-       * @param gateway Gateway config for the token
-       */
-      addToken(id: string, type?: TokenType, gateway?: GatewayConfig): Promise<void>;
-
-      /**
-       * Checks if a token has been added to ArConnect
-       * 
-       * @param id Token to check for
-       * 
-       * @returns Token added or not
-       */
-      isTokenAdded(id: string): Promise<boolean>;
-
-      /**
-       * Dispatch an Arweave transaction (preferably bundled)
-       *
-       * @param transaction Transaction to dispatch
-       * 
-       * @returns Dispatched transaction ID and type
-       */
-      dispatch(transaction: Transaction): Promise<DispatchResult>;
-
-      /**
-       * Create a deterministic secret based on the input data.
-       * 
-       * @param data Input data to generate the hash from
-       * @param options Hash configuration
-       * 
-       * @returns Hash array
-       */
-      privateHash(data: ArrayBuffer, options: SignMessageOptions): Promise<Uint8Array>;
-
-      /**
-       * Create and sign a DataItem (bundled transaction item),
-       * that can be loaded into "arbundles".
-       * 
-       * @param dataItem Data item params
-       * 
-       * @returns Buffer of the signed data item
-       */
-      signDataItem(dataItem: DataItem): Promise<ArrayBufferLike>;
-
-      /**
-       * Create a cryptographic signature for any piece of data for later validation.
-       * This function cannot be used to sign transactions or interactions, because the data
-       * gets hashed before the signature generation.
-       * 
-       * @param data Message to be hashed and signed
-       * @param options Signature options
-       * 
-       * @returns Signature
-       */
-      signMessage(data: ArrayBuffer, options?: SignMessageOptions): Promise<Uint8Array>;
-
-      /**
-       * Verify a cryptographic signature created with the arweaveWallet.signMessage() function.
-       * 
-       * @param data Data to verify with the signature
-       * @param signature Signature to validate
-       * @param publicKey Optionally match the signature with a different public key than the currently active
-       * @param options Signature options
-       * 
-       * @returns Validity
-       */
-      verifyMessage(
-        data: ArrayBuffer,
-        signature: ArrayBuffer | string,
-        publicKey?: string,
-        options?: SignMessageOptions
-      ): Promise<boolean>;
-
-      /**
-       * Experimental event emitter. Allows listening to gateway config
-       * updates, bundler node changes, etc.
-       */
-      events: Emitter<InjectedEvents>;
-    };
+    arweaveWallet: ArweaveWallet;
   }
+  
   interface WindowEventMap {
     walletSwitch: CustomEvent<{ address: string }>;
     arweaveWalletLoaded: CustomEvent<{}>;
   }
 }
 
+export type TypedArray =
+  | Int8Array
+  | Uint8Array
+  | Uint8ClampedArray
+  | Int16Array
+  | Uint16Array
+  | Int32Array
+  | Uint32Array
+  // | Float16Array
+  | Float32Array
+  | Float64Array
+  | BigInt64Array
+  | BigUint64Array;
+
+export type BinaryDataType = ArrayBuffer | TypedArray | DataView; // | Buffer;
+
+export interface ArweaveWallet {
+  /**
+   * Name of the wallet the API was provided by.
+   */
+  walletName: string;
+
+  /**
+   * Semver type version of the wallet
+   */
+  walletVersion: string;
+
+  /**
+   * Connect to ArConnect and request permissions. This function can always be
+   * called again if you want to request more permissions for your site.
+   *
+   * @param permissions
+   * @param appInfo
+   */
+  connect(
+    permissions: PermissionType[],
+    appInfo?: AppInfo,
+    gateway?: GatewayConfig
+  ): Promise<void>;
+
+  /**
+   * Disconnect from ArConnect. Removes all permissions from your site.
+   */
+  disconnect(): Promise<void>;
+
+  /**
+   * Get the currently used wallet's address in the extension.
+   *
+   * @returns Promise of wallet address string
+   */
+  getActiveAddress(): Promise<string>;
+
+  /**
+   * Get all addresses added to the ArConnect extension
+   *
+   * @returns Promise of a list of the added wallets' addresses.
+   */
+  getAllAddresses(): Promise<string[]>;
+
+  /**
+   * Get wallet names for addresses.
+   *
+   * @returns Promise of an object with addresses and wallet names
+   */
+  getWalletNames(): Promise<{ [addr: string]: string }>;
+
+  /**
+   * Sign a transaction.
+   *
+   * @param transaction A valid Arweave transaction without a wallet keyfile added to it
+   * @param options Arweave signing options
+   *
+   * @returns Promise of a signed transaction instance
+   */
+  sign(
+    transaction: Transaction,
+    options?: SignatureOptions
+  ): Promise<Transaction>;
+
+  /**
+   * Get the permissions allowed for you site by the user.
+   *
+   * @returns Promise of a list of permissions allowed for your dApp.
+   */
+  getPermissions(): Promise<PermissionType[]>;
+
+  /**
+   * Encrypt a string, using the user's wallet.
+   *
+   * @param data Buffer-like structure to encrypt.
+   * @param options Encrypt options. See https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/encrypt#algorithm.
+   *
+   * @returns Promise of the encrypted `Uint8Array`.
+   */
+  encrypt(
+    data: BinaryDataType,
+    options?: RsaOaepParams | AesCtrParams | AesCbcParams | AesGcmParams,
+  ): Promise<Uint8Array>;
+
+  /**
+   * Decrypt a string encrypted with the user's wallet.
+   *
+   * @param data Buffer-like structure to decrypt.
+   * @param options Decrypt options. See https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/decrypt#algorithm.
+   *
+   * @returns Promise of the decrypted `Uint8Array`.
+   */
+  decrypt(
+    data: BinaryDataType,
+    options?: RsaOaepParams | AesCtrParams | AesCbcParams | AesGcmParams,
+  ): Promise<Uint8Array>;
+
+  /**
+   * Get the user's custom Arweave config set in the extension
+   *
+   * @returns Promise of the user's Arweave config
+   */
+  getArweaveConfig(): Promise<GatewayConfig>;
+
+  /**
+   * @deprecated Find alternatives at https://docs.arconnect.io/api/signature
+   */
+  signature(
+    data: BinaryDataType,
+    // https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/sign#algorithm
+    algorithm?: RsaPssParams | EcdsaParams | { name: "RSASSA-PKCS1-v1_5" } | { name: "HMAC" },
+  ): Promise<Uint8Array>;
+
+  /**
+   * Get the user's active public key, from their wallet
+   *
+   * @returns Promise of the active public key
+   */
+  getActivePublicKey(): Promise<string>;
+
+  /**
+   * Add a token to ArConnect (if it is not already present)
+   *
+   * @param id Token contract ID
+   * @param type Type of the token (asset or collectible)
+   * @param gateway Gateway config for the token
+   */
+  addToken(id: string, type?: TokenType, gateway?: GatewayConfig): Promise<void>;
+
+  /**
+   * Checks if a token has been added to ArConnect
+   * 
+   * @param id Token to check for
+   * 
+   * @returns Token added or not
+   */
+  isTokenAdded(id: string): Promise<boolean>;
+
+  /**
+   * Dispatch an Arweave transaction (preferably bundled)
+   *
+   * @param transaction Transaction to dispatch
+   * 
+   * @returns Dispatched transaction ID and type
+   */
+  dispatch(transaction: Transaction): Promise<DispatchResult>;
+
+  /**
+   * Create a deterministic secret based on the input data.
+   * 
+   * @param data Input data to generate the hash from
+   * @param options Hash configuration
+   * 
+   * @returns Hash array
+   */
+  privateHash(data: ArrayBuffer, options: SignMessageOptions): Promise<Uint8Array>; // TODO: data is ArrayBuffer or BinaryDataType
+
+  /**
+   * Create and sign a DataItem (bundled transaction item),
+   * that can be loaded into "arbundles".
+   * 
+   * @param dataItem Data item params
+   * 
+   * @returns Buffer of the signed data item
+   */
+  signDataItem(dataItem: DataItem): Promise<ArrayBufferLike>; // TODO: Is this ArrayBufferLike or Buffer based on the example? `const dataItem = new DataItem(Buffer.from(result));` The implementation says `return Array.from<number>(dataEntry.getRaw());` in https://github.com/arconnectio/ArConnect/blob/production/src/api/modules/sign_data_item/sign_data_item.background.ts
+
+  /**
+   * Create a cryptographic signature for any piece of data for later validation.
+   * This function cannot be used to sign transactions or interactions, because the data
+   * gets hashed before the signature generation.
+   * 
+   * @param data Message to be hashed and signed
+   * @param options Signature options
+   * 
+   * @returns Signature
+   */
+  signMessage(data: ArrayBuffer, options?: SignMessageOptions): Promise<Uint8Array>; // TODO: data is ArrayBuffer or BinaryDataType
+
+  /**
+   * Verify a cryptographic signature created with the arweaveWallet.signMessage() function.
+   * 
+   * @param data Data to verify with the signature
+   * @param signature Signature to validate
+   * @param publicKey Optionally match the signature with a different public key than the currently active
+   * @param options Signature options
+   * 
+   * @returns Validity
+   */
+  verifyMessage(
+    data: ArrayBuffer, // TODO: data is ArrayBuffer or BinaryDataType
+    signature: ArrayBuffer | string, // TODO: signature is ArrayBuffer or BinaryDataType
+    publicKey?: string,
+    options?: SignMessageOptions
+  ): Promise<boolean>;
+
+  /**
+   * Experimental event emitter. Allows listening to gateway config
+   * updates, bundler node changes, etc.
+   */
+  events: Emitter<InjectedEvents>;
+}
+
 /**
  * Arweave wallet permission types
  */