diff --git a/substrate/core/cli/src/lib.rs b/substrate/core/cli/src/lib.rs
index 5821eddfef..0e06c6232d 100644
--- a/substrate/core/cli/src/lib.rs
+++ b/substrate/core/cli/src/lib.rs
@@ -50,7 +50,6 @@ extern crate clap;
 extern crate error_chain;
 #[macro_use]
 extern crate log;
-#[macro_use]
 extern crate structopt;
 
 mod params;
diff --git a/substrate/core/client/src/client.rs b/substrate/core/client/src/client.rs
index 2c85bbd588..a88aa6422c 100644
--- a/substrate/core/client/src/client.rs
+++ b/substrate/core/client/src/client.rs
@@ -24,7 +24,6 @@ use primitives::AuthorityId;
 use runtime_primitives::{
 	Justification,
 	generic::{BlockId, SignedBlock},
-	transaction_validity::{TransactionValidity, TransactionTag},
 };
 use consensus::{ImportBlock, ImportResult, BlockOrigin};
 use runtime_primitives::traits::{
@@ -32,7 +31,7 @@ use runtime_primitives::traits::{
 	ApiRef, ProvideRuntimeApi, Digest, DigestItem,
 };
 use runtime_primitives::BuildStorage;
-use runtime_api::{Core as CoreAPI, CallRuntimeAt, TaggedTransactionQueue, ConstructRuntimeApi};
+use runtime_api::{Core as CoreAPI, CallRuntimeAt, ConstructRuntimeApi};
 use primitives::{Blake2Hasher, H256, ChangesTrieConfiguration, convert_hash};
 use primitives::storage::{StorageKey, StorageData};
 use primitives::storage::well_known_keys;
@@ -139,8 +138,6 @@ pub struct BlockImportNotification<Block: BlockT> {
 	pub header: Block::Header,
 	/// Is this the new best block.
 	pub is_new_best: bool,
-	/// Tags provided by transactions imported in that block.
-	pub tags: Vec<TransactionTag>,
 }
 
 /// Summary of a finalized block.
@@ -537,37 +534,6 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		block_builder::BlockBuilder::at_block(parent, &self)
 	}
 
-	// TODO [ToDr] Optimize and re-use tags from the pool.
-	fn transaction_tags(
-		&self,
-		at: Block::Hash,
-		body: &Option<Vec<Block::Extrinsic>>
-	) -> error::Result<Vec<TransactionTag>> where
-		RA: TaggedTransactionQueue<Block>,
-		E: CallExecutor<Block, Blake2Hasher> + Send + Sync + Clone,
-	{
-		let id = BlockId::Hash(at);
-		Ok(match body {
-			None => vec![],
-			Some(ref extrinsics) => {
-				let mut tags = vec![];
-				for tx in extrinsics {
-					let tx = self.runtime_api().validate_transaction(&id, &tx)?;
-					match tx {
-						TransactionValidity::Valid { mut provides, .. } => {
-							tags.append(&mut provides);
-						},
-						// silently ignore invalid extrinsics,
-						// cause they might just be inherent
-						_ => {}
-					}
-
-				}
-				tags
-			},
-		})
-	}
-
 	fn execute_and_import_block(
 		&self,
 		origin: BlockOrigin,
@@ -579,7 +545,6 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		finalized: bool,
 		aux: Vec<(Vec<u8>, Option<Vec<u8>>)>,
 	) -> error::Result<ImportResult> where
-		RA: TaggedTransactionQueue<Block>,
 		E: CallExecutor<Block, Blake2Hasher> + Send + Sync + Clone,
 	{
 		let parent_hash = import_headers.post().parent_hash().clone();
@@ -607,7 +572,6 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			self.apply_finality(parent_hash, None, last_best, make_notifications)?;
 		}
 
-		let tags = self.transaction_tags(parent_hash, &body)?;
 		let mut transaction = self.backend.begin_operation(BlockId::Hash(parent_hash))?;
 		let (storage_update, changes_update, storage_changes) = match transaction.state()? {
 			Some(transaction_state) => {
@@ -697,7 +661,6 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 				origin,
 				header: import_headers.into_post(),
 				is_new_best,
-				tags,
 			};
 
 			self.import_notification_sinks.lock()
@@ -1055,7 +1018,6 @@ impl<B, E, Block, RA> consensus::BlockImport<Block> for Client<B, E, Block, RA>
 	B: backend::Backend<Block, Blake2Hasher>,
 	E: CallExecutor<Block, Blake2Hasher> + Clone + Send + Sync,
 	Block: BlockT<Hash=H256>,
-	RA: TaggedTransactionQueue<Block>
 {
 	type Error = Error;
 
diff --git a/substrate/core/consensus/common/src/lib.rs b/substrate/core/consensus/common/src/lib.rs
index 227131914c..fdba87b1c7 100644
--- a/substrate/core/consensus/common/src/lib.rs
+++ b/substrate/core/consensus/common/src/lib.rs
@@ -29,7 +29,6 @@ extern crate sr_primitives as runtime_primitives;
 extern crate tokio;
 
 extern crate parity_codec as codec;
-#[macro_use]
 extern crate parity_codec_derive;
 
 #[macro_use]
diff --git a/substrate/core/finality-grandpa/src/lib.rs b/substrate/core/finality-grandpa/src/lib.rs
index 1a800cd44d..c6f55e89ad 100644
--- a/substrate/core/finality-grandpa/src/lib.rs
+++ b/substrate/core/finality-grandpa/src/lib.rs
@@ -88,7 +88,6 @@ use client::{
 	error::Error as ClientError, error::ErrorKind as ClientErrorKind,
 };
 use client::blockchain::HeaderBackend;
-use client::runtime_api::TaggedTransactionQueue;
 use codec::{Encode, Decode};
 use consensus_common::{BlockImport, ImportBlock, ImportResult, Authorities};
 use runtime_primitives::traits::{
@@ -890,9 +889,9 @@ impl<B, E, Block: BlockT<Hash=H256>, RA, PRA> BlockImport<Block>
 		B: Backend<Block, Blake2Hasher> + 'static,
 		E: CallExecutor<Block, Blake2Hasher> + 'static + Clone + Send + Sync,
 		DigestFor<Block>: Encode,
-		RA: TaggedTransactionQueue<Block>,
+		RA: Send + Sync,
 		PRA: ProvideRuntimeApi,
-		PRA::Api: GrandpaApi<Block>
+		PRA::Api: GrandpaApi<Block>,
 {
 	type Error = ClientError;
 
@@ -1059,7 +1058,6 @@ impl<B, E, Block: BlockT<Hash=H256>, RA, PRA> Authorities<Block> for GrandpaBloc
 where
 	B: Backend<Block, Blake2Hasher> + 'static,
 	E: CallExecutor<Block, Blake2Hasher> + 'static + Clone + Send + Sync,
-	RA: TaggedTransactionQueue<Block>, // necessary for client to import `BlockImport`.
 {
 
 	type Error = <Client<B, E, Block, RA> as Authorities<Block>>::Error;
diff --git a/substrate/core/finality-grandpa/src/until_imported.rs b/substrate/core/finality-grandpa/src/until_imported.rs
index aba0472131..028b710acb 100644
--- a/substrate/core/finality-grandpa/src/until_imported.rs
+++ b/substrate/core/finality-grandpa/src/until_imported.rs
@@ -432,7 +432,6 @@ mod tests {
 				origin: BlockOrigin::File,
 				header,
 				is_new_best: false,
-				tags: Vec::new(),
 			}).unwrap();
 		}
 	}
diff --git a/substrate/core/network/src/test/mod.rs b/substrate/core/network/src/test/mod.rs
index daa961f8a2..6b0d36a1fc 100644
--- a/substrate/core/network/src/test/mod.rs
+++ b/substrate/core/network/src/test/mod.rs
@@ -189,6 +189,7 @@ impl<V: 'static + Verifier<Block>, D> Peer<V, D> {
 		io.to_disconnect.clone()
 	}
 
+	#[cfg(test)]
 	fn with_io<'a, F, U>(&'a self, f: F) -> U where F: FnOnce(&mut TestIo<'a>) -> U {
 		let mut io = TestIo::new(&self.queue, None);
 		f(&mut io)
diff --git a/substrate/core/service/src/components.rs b/substrate/core/service/src/components.rs
index cc6771a634..fe2e7df385 100644
--- a/substrate/core/service/src/components.rs
+++ b/substrate/core/service/src/components.rs
@@ -21,15 +21,16 @@ use serde::{Serialize, de::DeserializeOwned};
 use tokio::runtime::TaskExecutor;
 use chain_spec::{ChainSpec, Properties};
 use client_db;
-use client::{self, Client, runtime_api::{TaggedTransactionQueue, Metadata}};
-use {error, Service, RpcConfig, maybe_start_server, TransactionPoolAdapter};
+use client::{self, Client, runtime_api::{Metadata, TaggedTransactionQueue}};
+use {error, Service, RpcConfig, maybe_start_server};
 use network::{self, OnDemand, import_queue::ImportQueue};
 use substrate_executor::{NativeExecutor, NativeExecutionDispatch};
 use transaction_pool::txpool::{self, Options as TransactionPoolOptions, Pool as TransactionPool};
-use runtime_primitives::{traits::Block as BlockT, traits::Header as HeaderT, BuildStorage, generic::SignedBlock};
+use runtime_primitives::{BuildStorage, traits::{Block as BlockT, Header as HeaderT, ProvideRuntimeApi}, generic::{BlockId, SignedBlock}};
 use config::Configuration;
 use primitives::{Blake2Hasher, H256};
 use rpc;
+use parking_lot::Mutex;
 
 // Type aliases.
 // These exist mainly to avoid typing `<F as Factory>::Foo` all over the code.
@@ -118,8 +119,10 @@ impl<T: Serialize + DeserializeOwned + BuildStorage> RuntimeGenesis for T {}
 
 /// Something that can start the RPC service.
 pub trait StartRPC<C: Components> {
+	type ServersHandle: Send + Sync;
+
 	fn start_rpc(
-		client: Arc<Client<C::Backend, C::Executor, ComponentBlock<C>, C::RuntimeApi>>,
+		client: Arc<ComponentClient<C>>,
 		chain_name: String,
 		impl_name: &'static str,
 		impl_version: &'static str,
@@ -128,15 +131,17 @@ pub trait StartRPC<C: Components> {
 		properties: Properties,
 		task_executor: TaskExecutor,
 		transaction_pool: Arc<TransactionPool<C::TransactionPoolApi>>,
-	) -> Result<(Option<rpc::HttpServer>, Option<rpc::WsServer>), error::Error>;
+	) -> error::Result<Self::ServersHandle>;
 }
 
-impl<T: Components> StartRPC<Self> for T where
-	T::RuntimeApi: Metadata<ComponentBlock<T>>,
-	for<'de> SignedBlock<ComponentBlock<T>>: ::serde::Deserialize<'de>,
+impl<C: Components> StartRPC<Self> for C where
+	C::RuntimeApi: Metadata<ComponentBlock<C>>,
+	for<'de> SignedBlock<ComponentBlock<C>>: ::serde::Deserialize<'de>,
 {
+	type ServersHandle = (Option<rpc::HttpServer>, Option<Mutex<rpc::WsServer>>);
+
 	fn start_rpc(
-		client: Arc<Client<T::Backend, T::Executor, ComponentBlock<T>, T::RuntimeApi>>,
+		client: Arc<ComponentClient<C>>,
 		chain_name: String,
 		impl_name: &'static str,
 		impl_version: &'static str,
@@ -144,8 +149,8 @@ impl<T: Components> StartRPC<Self> for T where
 		rpc_ws: Option<SocketAddr>,
 		properties: Properties,
 		task_executor: TaskExecutor,
-		transaction_pool: Arc<TransactionPool<T::TransactionPoolApi>>,
-	) -> Result<(Option<rpc::HttpServer>, Option<rpc::WsServer>), error::Error> {
+		transaction_pool: Arc<TransactionPool<C::TransactionPoolApi>>,
+	) -> error::Result<Self::ServersHandle> {
 		let rpc_config = RpcConfig { properties, chain_name, impl_name, impl_version };
 
 		let handler = || {
@@ -156,7 +161,7 @@ impl<T: Components> StartRPC<Self> for T where
 			let author = rpc::apis::author::Author::new(
 				client.clone(), transaction_pool.clone(), subscriptions
 			);
-			rpc::rpc_handler::<ComponentBlock<T>, ComponentExHash<T>, _, _, _, _>(
+			rpc::rpc_handler::<ComponentBlock<C>, ComponentExHash<C>, _, _, _, _>(
 				state,
 				chain,
 				author,
@@ -166,45 +171,59 @@ impl<T: Components> StartRPC<Self> for T where
 
 		Ok((
 			maybe_start_server(rpc_http, |address| rpc::start_http(address, handler()))?,
-			maybe_start_server(rpc_ws, |address| rpc::start_ws(address, handler()))?,
+			maybe_start_server(rpc_ws, |address| rpc::start_ws(address, handler()))?.map(Mutex::new),
 		))
 	}
 }
 
-/// Something that can create an instance of `network::Params`.
-pub trait CreateNetworkParams<C: Components> {
-	fn create_network_params<S>(
-		client: Arc<Client<C::Backend, C::Executor, ComponentBlock<C>, C::RuntimeApi>>,
-		roles: network::config::Roles,
-		network_config: network::config::NetworkConfiguration,
-		on_demand: Option<Arc<OnDemand<FactoryBlock<C::Factory>, NetworkService<C::Factory>>>>,
-		transaction_pool_adapter: TransactionPoolAdapter<C>,
-		specialization: S,
-	) -> network::config::Params<ComponentBlock<C>, S, ComponentExHash<C>>;
+/// Something that can maintain transaction pool on every imported block.
+pub trait MaintainTransactionPool<C: Components> {
+	fn on_block_imported(
+		id: &BlockId<ComponentBlock<C>>,
+		client: &ComponentClient<C>,
+		transaction_pool: &TransactionPool<C::TransactionPoolApi>,
+	) -> error::Result<()>;
 }
 
-impl<T: Components> CreateNetworkParams<Self> for T where
-	T::RuntimeApi: TaggedTransactionQueue<ComponentBlock<T>>
+impl<C: Components> MaintainTransactionPool<Self> for C where
+	ComponentClient<C>: ProvideRuntimeApi<Api = C::RuntimeApi>,
+	C::RuntimeApi: TaggedTransactionQueue<ComponentBlock<C>>,
 {
-	fn create_network_params<S>(
-		client: Arc<Client<T::Backend, T::Executor, ComponentBlock<T>, T::RuntimeApi>>,
-		roles: network::config::Roles,
-		network_config: network::config::NetworkConfiguration,
-		on_demand: Option<Arc<OnDemand<FactoryBlock<T::Factory>, NetworkService<T::Factory>>>>,
-		transaction_pool_adapter: TransactionPoolAdapter<T>,
-		specialization: S,
-	) -> network::config::Params<ComponentBlock<T>, S, ComponentExHash<T>> {
-		network::config::Params {
-			config: network::config::ProtocolConfig { roles },
-			network_config,
-			chain: client,
-			on_demand: on_demand.map(|d| d as Arc<network::OnDemandService<ComponentBlock<T>>>),
-			transaction_pool: Arc::new(transaction_pool_adapter),
-			specialization,
-		}
+	// TODO [ToDr] Optimize and re-use tags from the pool.
+	fn on_block_imported(
+		id: &BlockId<ComponentBlock<C>>,
+		client: &ComponentClient<C>,
+		transaction_pool: &TransactionPool<C::TransactionPoolApi>,
+	) -> error::Result<()> {
+		use runtime_primitives::transaction_validity::TransactionValidity;
+
+		let block = client.block(id)?;
+		let tags = match block {
+			None => return Ok(()),
+			Some(block) => {
+				let mut tags = vec![];
+				for tx in block.block.extrinsics() {
+					let tx = client.runtime_api().validate_transaction(id, &tx)?;
+					match tx {
+						TransactionValidity::Valid { mut provides, .. } => {
+							tags.append(&mut provides);
+						},
+						// silently ignore invalid extrinsics,
+						// cause they might just be inherent
+						_ => {}
+					}
+
+				}
+				tags
+			}
+		};
+
+		transaction_pool.prune_tags(id, tags).map_err(|e| format!("{:?}", e))?;
+		Ok(())
 	}
 }
 
+
 /// The super trait that combines all required traits a `Service` needs to implement.
 pub trait ServiceTrait<C: Components>:
 	Deref<Target = Service<C>>
@@ -212,10 +231,10 @@ pub trait ServiceTrait<C: Components>:
 	+ Sync
 	+ 'static
 	+ StartRPC<C>
-	+ CreateNetworkParams<C>
+	+ MaintainTransactionPool<C>
 {}
 impl<C: Components, T> ServiceTrait<C> for T where
-	T: Deref<Target = Service<C>> + Send + Sync + 'static + StartRPC<C> + CreateNetworkParams<C>
+	T: Deref<Target = Service<C>> + Send + Sync + 'static + StartRPC<C> + MaintainTransactionPool<C>
 {}
 
 /// A collection of types and methods to build a service on top of the substrate service.
@@ -245,7 +264,7 @@ pub trait ServiceFactory: 'static + Sized {
 	/// ImportQueue for light clients
 	type LightImportQueue: network::import_queue::ImportQueue<Self::Block> + 'static;
 
-	//TODO: replace these with a constructor trait. that TransactionPool implements.
+	//TODO: replace these with a constructor trait. that TransactionPool implements. (#1242)
 	/// Extrinsic pool constructor for the full client.
 	fn build_full_transaction_pool(config: TransactionPoolOptions, client: Arc<FullClient<Self>>)
 		-> Result<TransactionPool<Self::FullTransactionPoolApi>, error::Error>;
@@ -303,17 +322,18 @@ pub trait Components: Sized + 'static {
 	type Backend: 'static + client::backend::Backend<FactoryBlock<Self::Factory>, Blake2Hasher>;
 	/// Client executor.
 	type Executor: 'static + client::CallExecutor<FactoryBlock<Self::Factory>, Blake2Hasher> + Send + Sync + Clone;
-	/// Extrinsic pool type.
-	type TransactionPoolApi: 'static + txpool::ChainApi<
-		Hash = <<Self::Factory as ServiceFactory>::Block as BlockT>::Hash,
-		Block = FactoryBlock<Self::Factory>
-	>;
 	/// The type that implements the runtime API.
 	type RuntimeApi: Send + Sync;
 	/// A type that can start the RPC.
 	type RPC: StartRPC<Self>;
-	/// A type that can create the network params.
-	type CreateNetworkParams: CreateNetworkParams<Self>;
+	// TODO [ToDr] Traitify transaction pool and allow people to implement their own. (#1242)
+	/// A type that can maintain transaction pool.
+	type TransactionPool: MaintainTransactionPool<Self>;
+	/// Extrinsic pool type.
+	type TransactionPoolApi: 'static + txpool::ChainApi<
+		Hash = <FactoryBlock<Self::Factory> as BlockT>::Hash,
+		Block = FactoryBlock<Self::Factory>
+	>;
 
 	/// Our Import Queue
 	type ImportQueue: ImportQueue<FactoryBlock<Self::Factory>> + 'static;
@@ -383,7 +403,7 @@ impl<Factory: ServiceFactory> Components for FullComponents<Factory> {
 	type ImportQueue = Factory::FullImportQueue;
 	type RuntimeApi = Factory::RuntimeApi;
 	type RPC = Factory::FullService;
-	type CreateNetworkParams = Factory::FullService;
+	type TransactionPool = Factory::FullService;
 
 	fn build_client(
 		config: &FactoryFullConfiguration<Factory>,
@@ -458,7 +478,7 @@ impl<Factory: ServiceFactory> Components for LightComponents<Factory> {
 	type ImportQueue = <Factory as ServiceFactory>::LightImportQueue;
 	type RuntimeApi = Factory::RuntimeApi;
 	type RPC = Factory::LightService;
-	type CreateNetworkParams = Factory::LightService;
+	type TransactionPool = Factory::LightService;
 
 	fn build_client(
 		config: &FactoryFullConfiguration<Factory>,
diff --git a/substrate/core/service/src/error.rs b/substrate/core/service/src/error.rs
index ce6f61ca04..c3bacd1980 100644
--- a/substrate/core/service/src/error.rs
+++ b/substrate/core/service/src/error.rs
@@ -24,6 +24,7 @@ error_chain! {
 	foreign_links {
 		Io(::std::io::Error) #[doc="IO error"];
 	}
+
 	links {
 		Client(client::error::Error, client::error::ErrorKind) #[doc="Client error"];
 		Network(network::error::Error, network::error::ErrorKind) #[doc="Network error"];
diff --git a/substrate/core/service/src/lib.rs b/substrate/core/service/src/lib.rs
index f5e578d72f..603f9df82a 100644
--- a/substrate/core/service/src/lib.rs
+++ b/substrate/core/service/src/lib.rs
@@ -63,11 +63,10 @@ use std::collections::HashMap;
 #[doc(hidden)]
 pub use std::{ops::Deref, result::Result, sync::Arc};
 use futures::prelude::*;
-use parking_lot::Mutex;
 use keystore::Store as Keystore;
 use client::BlockchainEvents;
-use runtime_primitives::traits::{Header, As};
 use runtime_primitives::generic::BlockId;
+use runtime_primitives::traits::{Header, As};
 use exit_future::Signal;
 #[doc(hidden)]
 pub use tokio::runtime::TaskExecutor;
@@ -88,7 +87,7 @@ pub use components::{ServiceFactory, FullBackend, FullExecutor, LightBackend,
 	FactoryFullConfiguration, RuntimeGenesis, FactoryGenesis,
 	ComponentExHash, ComponentExtrinsic, FactoryExtrinsic
 };
-use components::{StartRPC, CreateNetworkParams};
+use components::{StartRPC, MaintainTransactionPool};
 #[doc(hidden)]
 pub use network::OnDemand;
 
@@ -104,8 +103,7 @@ pub struct Service<Components: components::Components> {
 	signal: Option<Signal>,
 	/// Configuration of this Service
 	pub config: FactoryFullConfiguration<Components::Factory>,
-	_rpc_http: Option<rpc::HttpServer>,
-	_rpc_ws: Option<Mutex<rpc::WsServer>>, // WsServer is not `Sync`, but the service needs to be.
+	_rpc: Box<::std::any::Any + Send + Sync>,
 	_telemetry: Option<tel::Telemetry>,
 }
 
@@ -121,12 +119,7 @@ pub fn new_client<Factory: components::ServiceFactory>(config: &FactoryFullConfi
 	Ok(client)
 }
 
-impl<Components> Service<Components>
-	where
-		Components: components::Components,
-		<Components as components::Components>::Executor: std::clone::Clone,
-		// <Components as components::Components>::RuntimeApi: client::runtime_api::BlockBuilder<<<Components as components::Components>::Factory as ServiceFactory>::Block, Error=client::error::Error, OverlayedChanges=client::runtime_api::OverlayedChanges> + Sync + Send + client::runtime_api::Core<<<Components as components::Components>::Factory as components::ServiceFactory>::Block, primitives::AuthorityId, Error=client::error::Error, OverlayedChanges=client::runtime_api::OverlayedChanges> + client::runtime_api::ConstructRuntimeApi<Block=<<Components as components::Components>::Factory as ServiceFactory>::Block> + client::runtime_api::Metadata<<<Components as components::Components>::Factory as components::ServiceFactory>::Block, Vec<u8>, Error=client::error::Error> + client::runtime_api::TaggedTransactionQueue<<<Components as components::Components>::Factory as components::ServiceFactory>::Block, Error=client::error::Error>,
-{
+impl<Components: components::Components> Service<Components> {
 	/// Creates a new service.
 	pub fn new(
 		mut config: FactoryFullConfiguration<Components::Factory>,
@@ -170,20 +163,20 @@ impl<Components> Service<Components>
 		let transaction_pool = Arc::new(
 			Components::build_transaction_pool(config.transaction_pool.clone(), client.clone())?
 		);
-		let transaction_pool_adapter = TransactionPoolAdapter::<Components> {
+		let transaction_pool_adapter = Arc::new(TransactionPoolAdapter::<Components> {
 			imports_external_transactions: !(config.roles == Roles::LIGHT),
 			pool: transaction_pool.clone(),
 			client: client.clone(),
-		 };
+		 });
 
-		let network_params = Components::CreateNetworkParams::create_network_params(
-			client.clone(),
-			config.roles,
-			config.network.clone(),
-			on_demand.clone(),
-			transaction_pool_adapter,
-			network_protocol,
-		);
+		let network_params = network::config::Params {
+			config: network::config::ProtocolConfig { roles: config.roles },
+			network_config: config.network.clone(),
+			chain: client.clone(),
+			on_demand: on_demand.as_ref().map(|d| d.clone() as _),
+			transaction_pool: transaction_pool_adapter.clone() as _,
+			specialization: network_protocol,
+		};
 
 		let protocol_id = {
 			let protocol_id_full = config.chain_spec.protocol_id().unwrap_or(DEFAULT_PROTOCOL_ID).as_bytes();
@@ -206,15 +199,21 @@ impl<Components> Service<Components>
 		{
 			// block notifications
 			let network = Arc::downgrade(&network);
-			let txpool = transaction_pool.clone();
+			let txpool = Arc::downgrade(&transaction_pool);
+			let wclient = Arc::downgrade(&client);
 
 			let events = client.import_notification_stream()
 				.for_each(move |notification| {
 					if let Some(network) = network.upgrade() {
 						network.on_block_imported(notification.hash, &notification.header);
 					}
-					txpool.prune_tags(&BlockId::hash(notification.hash), notification.tags)
-						.map_err(|e| warn!("Error removing extrinsics: {:?}", e))?;
+					if let (Some(txpool), Some(client)) = (txpool.upgrade(), wclient.upgrade()) {
+						Components::TransactionPool::on_block_imported(
+							&BlockId::hash(notification.hash),
+							&*client,
+							&*txpool,
+						).map_err(|e| warn!("Pool error processing new block: {:?}", e))?;
+					}
 					Ok(())
 				})
 				.select(exit.clone())
@@ -241,7 +240,7 @@ impl<Components> Service<Components>
 
 
 		// RPC
-		let (rpc_http, rpc_ws) = Components::RPC::start_rpc(
+		let rpc = Components::RPC::start_rpc(
 			client.clone(), config.chain_spec.name().to_string(), config.impl_name,
 			config.impl_version, config.rpc_http, config.rpc_ws, config.chain_spec.properties(),
 			task_executor.clone(), transaction_pool.clone()
@@ -275,15 +274,14 @@ impl<Components> Service<Components>
 		};
 
 		Ok(Service {
-			client: client,
+			client,
 			network: Some(network),
-			transaction_pool: transaction_pool,
+			transaction_pool,
 			signal: Some(signal),
-			keystore: keystore,
+			keystore,
 			config,
 			exit,
-			_rpc_http: rpc_http,
-			_rpc_ws: rpc_ws.map(Mutex::new),
+			_rpc: Box::new(rpc),
 			_telemetry: telemetry,
 		})
 	}
diff --git a/substrate/core/telemetry/src/lib.rs b/substrate/core/telemetry/src/lib.rs
index 64e55d48b2..927994cca5 100644
--- a/substrate/core/telemetry/src/lib.rs
+++ b/substrate/core/telemetry/src/lib.rs
@@ -27,7 +27,7 @@ extern crate slog_async;
 extern crate slog_json;
 #[macro_use]
 extern crate log;
-#[macro_use(o, kv)]
+#[macro_use(o)]
 extern crate slog;
 extern crate slog_scope;
 
diff --git a/substrate/core/transaction-pool/graph/src/pool.rs b/substrate/core/transaction-pool/graph/src/pool.rs
index d9b4b33f36..a16db8206e 100644
--- a/substrate/core/transaction-pool/graph/src/pool.rs
+++ b/substrate/core/transaction-pool/graph/src/pool.rs
@@ -54,7 +54,7 @@ pub type TransactionFor<A> = Arc<base::Transaction<ExHash<A>, ExtrinsicFor<A>>>;
 pub trait ChainApi: Send + Sync {
 	/// Block type.
 	type Block: traits::Block;
-	/// Hash type
+	/// Transaction Hash type
 	type Hash: hash::Hash + Eq + traits::Member + Serialize;
 	/// Error type.
 	type Error: From<error::Error> + error::IntoPoolError;
diff --git a/substrate/srml/support/src/lib.rs b/substrate/srml/support/src/lib.rs
index f825ef9027..2f4b9b3ecb 100644
--- a/substrate/srml/support/src/lib.rs
+++ b/substrate/srml/support/src/lib.rs
@@ -30,7 +30,6 @@ pub extern crate sr_primitives as runtime_primitives;
 extern crate srml_metadata;
 
 extern crate mashup;
-
 #[macro_use]
 extern crate srml_support_procedural;