--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2554,7 +2554,7 @@
  "fc-db",
  "fc-rpc-core",
  "fp-consensus",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "fp-rpc",
  "fp-storage",
  "futures 0.3.21",
@@ -2565,7 +2565,7 @@
  "log",
  "lru 0.6.6",
  "pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "parity-scale-codec",
  "parking_lot 0.11.2",
  "rand 0.7.3",
@@ -2766,7 +2766,7 @@
 dependencies = [
  "ethereum",
  "ethereum-types",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "parity-scale-codec",
  "scale-info",
  "sp-api",
@@ -2862,6 +2862,21 @@
 ]
 
 [[package]]
+name = "frame-common"
+version = "0.1.0"
+source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#0a1dc4086cbe971ddf57edf82a61cfce52c8c20b"
+dependencies = [
+ "frame-system",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=feature/300)",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-std",
+ "up-evm-mapping",
+]
+
+[[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
 source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65"
@@ -5845,7 +5860,7 @@
 dependencies = [
  "frame-support",
  "frame-system",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -5997,7 +6012,7 @@
  "fp-evm-mapping",
  "frame-support",
  "frame-system",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "pallet-evm-coder-substrate",
  "parity-scale-codec",
  "scale-info",
@@ -6083,7 +6098,7 @@
  "frame-system",
  "log",
  "pallet-balances",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "pallet-timestamp",
  "parity-scale-codec",
  "rlp",
@@ -6136,7 +6151,7 @@
  "frame-support",
  "frame-system",
  "pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -6152,7 +6167,7 @@
  "frame-support",
  "frame-system",
  "log",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "pallet-evm-coder-substrate",
  "parity-scale-codec",
  "scale-info",
@@ -6166,11 +6181,11 @@
 name = "pallet-evm-migration"
 version = "0.1.0"
 dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -6188,7 +6203,7 @@
  "frame-support",
  "frame-system",
  "pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -6205,6 +6220,7 @@
  "ethereum",
  "evm-coder",
  "frame-benchmarking",
+ "frame-common",
  "frame-support",
  "frame-system",
  "pallet-common",
@@ -6432,6 +6448,7 @@
  "ethereum",
  "evm-coder",
  "frame-benchmarking",
+ "frame-common",
  "frame-support",
  "frame-system",
  "pallet-common",
@@ -6549,6 +6566,7 @@
 version = "0.1.0"
 dependencies = [
  "frame-benchmarking",
+ "frame-common",
  "frame-support",
  "frame-system",
  "pallet-common",
@@ -6813,13 +6831,14 @@
  "fp-evm",
  "fp-evm-mapping",
  "frame-benchmarking",
+ "frame-common",
  "frame-support",
  "frame-system",
  "hex-literal",
  "pallet-balances",
  "pallet-common",
  "pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "pallet-evm-coder-substrate",
  "pallet-fungible",
  "pallet-nonfungible",
@@ -12201,7 +12220,7 @@
  "chrono",
  "lazy_static",
  "matchers",
- "parking_lot 0.11.2",
+ "parking_lot 0.10.2",
  "regex",
  "serde",
  "serde_json",
@@ -12348,6 +12367,7 @@
 name = "uc-rpc"
 version = "0.1.0"
 dependencies = [
+ "frame-common",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -12566,6 +12586,7 @@
  "fp-rpc",
  "fp-self-contained",
  "frame-benchmarking",
+ "frame-common",
  "frame-executive",
  "frame-support",
  "frame-system",
@@ -12578,7 +12599,7 @@
  "pallet-base-fee",
  "pallet-common",
  "pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
  "pallet-evm-coder-substrate",
  "pallet-evm-contract-helpers",
  "pallet-evm-migration",
@@ -12706,6 +12727,7 @@
 name = "up-rpc"
 version = "0.1.0"
 dependencies = [
+ "frame-common",
  "pallet-common",
  "pallet-evm",
  "parity-scale-codec",
--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -16,8 +16,8 @@
 evm-coder = { default-features = false, path = '../../crates/evm-coder' }
 pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
 pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
 up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
 log = "0.4.14"
 
 [dependencies.codec]
--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -26,6 +26,7 @@
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
 
 [features]
 default = ["std"]
--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -26,6 +26,7 @@
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
 
 [features]
 default = ["std"]
--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -23,6 +23,7 @@
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
 
 [features]
 default = ["std"]
--- a/pallets/unique/src/mock.rs
+++ b/pallets/unique/src/mock.rs
@@ -25,9 +25,8 @@
 };
 use pallet_transaction_payment::{CurrencyAdapter};
 use frame_system as system;
-use pallet_evm::{AddressMapping, runner::stack::MaybeMirroredLog};
+use pallet_evm::{AddressMapping, runner::stack::MaybeMirroredLog, account::CrossAccountId};
 use fp_evm_mapping::EvmBackwardsAddressMapping;
-use pallet_evm::account::CrossAccountId;
 use codec::{Encode, Decode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use up_data_structs::ConstU32;
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -307,6 +307,11 @@
 	type WeightInfo = pallet_evm_migration::weights::SubstrateWeight<Self>;
 }
 
+impl frame_common::account::Config for Runtime {
+	type EvmAddressMapping = pallet_evm::HashedAddressMapping<Self::Hashing>;
+	type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
+}
+
 pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);
 impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {
 	fn find_author<'a, I>(digests: I) -> Option<H160>