diff --git a/Cargo.lock b/Cargo.lock
index 2b3727b..305b814 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -779,7 +779,7 @@ dependencies = [
 [[package]]
 name = "claims-primitives"
 version = "0.1.0"
-source = "git+https://github.com/integritee-network/pallets.git?branch=master#6b2a361aacd04969825afd978ab54f8d42930413"
+source = "git+https://github.com/integritee-network/pallets.git?branch=master#6471e270abf812f1eb5fe8c163373d8d21e75e55"
 dependencies = [
  "parity-scale-codec",
  "rustc-hex",
@@ -2158,7 +2158,7 @@ dependencies = [
 [[package]]
 name = "ias-verify"
 version = "0.1.4"
-source = "git+https://github.com/integritee-network/pallets.git?branch=master#6b2a361aacd04969825afd978ab54f8d42930413"
+source = "git+https://github.com/integritee-network/pallets.git?branch=master#6471e270abf812f1eb5fe8c163373d8d21e75e55"
 dependencies = [
  "base64 0.11.0",
  "chrono",
@@ -3899,7 +3899,7 @@ dependencies = [
 [[package]]
 name = "pallet-claims"
 version = "0.9.12"
-source = "git+https://github.com/integritee-network/pallets.git?branch=master#6b2a361aacd04969825afd978ab54f8d42930413"
+source = "git+https://github.com/integritee-network/pallets.git?branch=master#6471e270abf812f1eb5fe8c163373d8d21e75e55"
 dependencies = [
  "claims-primitives",
  "frame-benchmarking",
@@ -4037,7 +4037,7 @@ dependencies = [
 [[package]]
 name = "pallet-teeracle"
 version = "0.1.0"
-source = "git+https://github.com/integritee-network/pallets.git?branch=master#6b2a361aacd04969825afd978ab54f8d42930413"
+source = "git+https://github.com/integritee-network/pallets.git?branch=master#6471e270abf812f1eb5fe8c163373d8d21e75e55"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4060,7 +4060,7 @@ dependencies = [
 [[package]]
 name = "pallet-teerex"
 version = "0.9.0"
-source = "git+https://github.com/integritee-network/pallets.git?branch=master#6b2a361aacd04969825afd978ab54f8d42930413"
+source = "git+https://github.com/integritee-network/pallets.git?branch=master#6471e270abf812f1eb5fe8c163373d8d21e75e55"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7229,7 +7229,7 @@ checksum = "d9bffcddbc2458fa3e6058414599e3c838a022abae82e5c67b4f7f80298d5bff"
 [[package]]
 name = "teeracle-primitives"
 version = "0.1.0"
-source = "git+https://github.com/integritee-network/pallets.git?branch=master#6b2a361aacd04969825afd978ab54f8d42930413"
+source = "git+https://github.com/integritee-network/pallets.git?branch=master#6471e270abf812f1eb5fe8c163373d8d21e75e55"
 dependencies = [
  "sp-std",
  "substrate-fixed",
@@ -7238,7 +7238,7 @@ dependencies = [
 [[package]]
 name = "teerex-primitives"
 version = "0.1.0"
-source = "git+https://github.com/integritee-network/pallets.git?branch=master#6b2a361aacd04969825afd978ab54f8d42930413"
+source = "git+https://github.com/integritee-network/pallets.git?branch=master#6471e270abf812f1eb5fe8c163373d8d21e75e55"
 dependencies = [
  "ias-verify",
  "parity-scale-codec",
@@ -7273,7 +7273,7 @@ dependencies = [
 [[package]]
 name = "test-utils"
 version = "0.1.0"
-source = "git+https://github.com/integritee-network/pallets.git?branch=master#6b2a361aacd04969825afd978ab54f8d42930413"
+source = "git+https://github.com/integritee-network/pallets.git?branch=master#6471e270abf812f1eb5fe8c163373d8d21e75e55"
 dependencies = [
  "hex-literal",
  "log",
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 552256e..5b3d784 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -40,9 +40,7 @@ use sp_std::prelude::*;
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 // A few exports that help ease life for downstream crates.
-use frame_support::traits::{
-	Contains, EqualPrivilegeOnly, Imbalance, InstanceFilter, OnUnbalanced,
-};
+use frame_support::traits::{EqualPrivilegeOnly, Imbalance, InstanceFilter, OnUnbalanced};
 pub use frame_support::{
 	construct_runtime, parameter_types,
 	traits::{KeyOwnerProofSystem, Randomness, StorageInfo},
@@ -221,27 +219,10 @@ parameter_types! {
 	pub const SS58Prefix: u8 = 13;
 }
 
-pub struct BaseFilter;
-#[rustfmt::skip]
-impl Contains<Call> for BaseFilter {
-	//Block send extrinsics for mainnent before official token generation event
-	fn contains(call: &Call) -> bool {
-		!matches!(
-			call,
-			// filter until we have resolved https://github.com/integritee-network/pallets/issues/17
-			Call::Teeracle(_) 
-		)
-	}
-}
-
 // Configure FRAME pallets to include in runtime.
 
 impl frame_system::Config for Runtime {
-	#[cfg(feature = "skip-extrinsic-filtering")]
 	type BaseCallFilter = frame_support::traits::Everything;
-	//Block extrinsics for mainnet before official token generation event
-	#[cfg(not(feature = "skip-extrinsic-filtering"))]
-	type BaseCallFilter = BaseFilter;
 	/// Block & extrinsics weights: base values and limits.
 	type BlockWeights = BlockWeights;
 	/// The maximum length of a block (in bytes).
@@ -398,10 +379,15 @@ impl pallet_claims::Config for Runtime {
 	type MoveClaimOrigin = frame_system::EnsureRoot<AccountId>;
 	type WeightInfo = weights::pallet_claims::WeightInfo<Runtime>;
 }
+parameter_types! {
+	pub const MaxWhitelistedReleases: u32 = 10;
+}
+
 /// added by Integritee
 impl pallet_teeracle::Config for Runtime {
 	type Event = Event;
 	type WeightInfo = weights::pallet_teeracle::WeightInfo<Runtime>;
+	type MaxWhitelistedReleases = MaxWhitelistedReleases;
 }
 
 parameter_types! {
diff --git a/runtime/src/weights/pallet_teeracle.rs b/runtime/src/weights/pallet_teeracle.rs
index 1dea2bc..fdaec55 100644
--- a/runtime/src/weights/pallet_teeracle.rs
+++ b/runtime/src/weights/pallet_teeracle.rs
@@ -29,11 +29,24 @@ use sp_std::marker::PhantomData;
 /// Weight functions for pallet_teeracle.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_teeracle::WeightInfo for WeightInfo<T> {
+	// Storage: Teerex Whitelist (r:1 w:1)
+	fn add_to_whitelist() -> Weight {
+		(86_491_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	// Storage: Teerex Whitelist (r:1 w:1)
+	fn remove_from_whitelist() -> Weight {
+		(86_491_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
 	// Storage: Teerex EnclaveIndex (r:1 w:0)
 	// Storage: Teeracle ExchangeRates (r:1 w:1)
+	// Storage: Teerex Whitelist (r:1 w:0)
 	fn update_exchange_rate() -> Weight {
 		(86_491_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 }