diff --git a/consensus/src/lib.rs b/consensus/src/lib.rs
index 3033d2d5f0..99eacb9d19 100644
--- a/consensus/src/lib.rs
+++ b/consensus/src/lib.rs
@@ -63,6 +63,16 @@ pub struct FrontierBlockImport<B: BlockT, I, C> {
 	_marker: PhantomData<B>,
 }
 
+impl<Block: BlockT, I: Clone + BlockImport<Block>, C> Clone for FrontierBlockImport<Block, I, C> {
+	fn clone(&self) -> Self {
+		FrontierBlockImport {
+			inner: self.inner.clone(),
+			client: self.client.clone(),
+			_marker: PhantomData,
+		}
+	}
+}
+
 impl<B, I, C> FrontierBlockImport<B, I, C> where
 	B: BlockT,
 	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync,
diff --git a/template/node/src/service.rs b/template/node/src/service.rs
index e4c138eaed..388ecac53a 100644
--- a/template/node/src/service.rs
+++ b/template/node/src/service.rs
@@ -27,8 +27,17 @@ type FullBackend = sc_service::TFullBackend<Block>;
 type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
 
 pub enum ConsensusResult {
-	GrandPa((
-		sc_finality_grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>,
+	Aura((
+		sc_consensus_aura::AuraBlockImport<
+			Block,
+			FullClient,
+			FrontierBlockImport<
+				Block,
+				sc_finality_grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>,
+				FullClient
+			>,
+			AuraPair
+		>,
 		sc_finality_grandpa::LinkHalf<Block, FullClient, FullSelectChain>
 	)),
 	ManualSeal
@@ -90,7 +99,7 @@ pub fn new_partial(config: &Configuration, manual_seal: bool) -> Result<
 
 	let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _, _>(
 		sc_consensus_aura::slot_duration(&*client)?,
-		aura_block_import,
+		aura_block_import.clone(),
 		Some(Box::new(grandpa_block_import.clone())),
 		None,
 		client.clone(),
@@ -103,7 +112,7 @@ pub fn new_partial(config: &Configuration, manual_seal: bool) -> Result<
 	Ok(sc_service::PartialComponents {
 		client, backend, task_manager, import_queue, keystore, select_chain, transaction_pool,
 		inherent_data_providers,
-		other: ConsensusResult::GrandPa((grandpa_block_import, grandpa_link))
+		other: ConsensusResult::Aura((aura_block_import, grandpa_link))
 	})
 }
 
@@ -129,7 +138,7 @@ pub fn new_full(config: Configuration, manual_seal: bool) -> Result<TaskManager,
 				finality_proof_provider: None,
 			})?
 		},
-		ConsensusResult::GrandPa((_, _)) => {
+		ConsensusResult::Aura((_, _)) => {
 			sc_service::build_network(sc_service::BuildNetworkParams {
 				config: &config,
 				client: client.clone(),
@@ -217,7 +226,7 @@ pub fn new_full(config: Configuration, manual_seal: bool) -> Result<TaskManager,
 			}
 			log::info!("Manual Seal Ready");
 		},
-		ConsensusResult::GrandPa((grandpa_block_import, grandpa_link)) => {
+		ConsensusResult::Aura((aura_block_import, grandpa_link)) => {
 			if role.is_authority() {
 				let proposer = sc_basic_authorship::ProposerFactory::new(
 					client.clone(),
@@ -231,7 +240,7 @@ pub fn new_full(config: Configuration, manual_seal: bool) -> Result<TaskManager,
 					sc_consensus_aura::slot_duration(&*client)?,
 					client.clone(),
 					select_chain,
-					grandpa_block_import,
+					aura_block_import,
 					proposer,
 					network.clone(),
 					inherent_data_providers.clone(),