diff --git a/packages/contracts/script/local/L2ArbitrumResolver.sol b/packages/contracts/script/local/L2ArbitrumResolver.sol
index c92935c..7217b33 100644
--- a/packages/contracts/script/local/L2ArbitrumResolver.sol
+++ b/packages/contracts/script/local/L2ArbitrumResolver.sol
@@ -28,7 +28,7 @@ import {SubdomainController} from "../../src/SubdomainController.sol";
 import {
     OffchainRegister,
     RegisterRequest
-} from "../../src/interfaces/OffchainResolver.sol";
+} from "../../src/interfaces/WildcardWriting.sol";
 
 contract L2ArbitrumResolver is Script, ENSHelper {
 
diff --git a/packages/contracts/src/DatabaseResolver.sol b/packages/contracts/src/DatabaseResolver.sol
index 7e7c51e..0229bf9 100644
--- a/packages/contracts/src/DatabaseResolver.sol
+++ b/packages/contracts/src/DatabaseResolver.sol
@@ -411,7 +411,7 @@ contract DatabaseResolver is
         override
         returns (bytes[] memory)
     {
-        _offChainStorage();
+        _offChainStorage(msg.data);
     }
 
     function multicallWithNodeCheck(
@@ -423,7 +423,7 @@ contract DatabaseResolver is
         override
         returns (bytes[] memory)
     {
-        _offChainStorage();
+        _offChainStorage(msg.data);
     }
 
     //////// ENS WRITE DEFERRAL RESOLVER (EIP-5559) ////////
@@ -586,25 +586,4 @@ contract DatabaseResolver is
             || super.supportsInterface(interfaceID);
     }
 
-    function multicall(bytes[] calldata /* data */ )
-        external
-        view
-        override
-        returns (bytes[] memory)
-    {
-        _offChainStorage(msg.data);
-    }
-
-    function multicallWithNodeCheck(
-        bytes32,
-        bytes[] calldata /* data */
-    )
-        external
-        view
-        override
-        returns (bytes[] memory)
-    {
-        _offChainStorage(msg.data);
-    }
-
 }
diff --git a/packages/contracts/src/L1Resolver.sol b/packages/contracts/src/L1Resolver.sol
index 4b9ce52..67603a7 100644
--- a/packages/contracts/src/L1Resolver.sol
+++ b/packages/contracts/src/L1Resolver.sol
@@ -21,7 +21,9 @@ import {EVMFetcher} from "./evmgateway/EVMFetcher.sol";
 import {IEVMVerifier} from "./evmgateway/IEVMVerifier.sol";
 import {EVMFetchTarget} from "./evmgateway/EVMFetchTarget.sol";
 import {IWriteDeferral} from "./interfaces/IWriteDeferral.sol";
-import {WildcardWriting} from "./interfaces/WildcardWriting.sol";
+import {
+    WildcardWriting, OffchainRegister
+} from "./interfaces/WildcardWriting.sol";
 
 contract L1Resolver is
     EVMFetchTarget,