diff --git a/cgatcore/__init__.py b/cgatcore/__init__.py
index e69de29b..b81f6279 100644
--- a/cgatcore/__init__.py
+++ b/cgatcore/__init__.py
@@ -0,0 +1 @@
+from . import remote
diff --git a/cgatcore/pipeline/__init__.py b/cgatcore/pipeline/__init__.py
index 1223ea63..bd4e7ff8 100644
--- a/cgatcore/pipeline/__init__.py
+++ b/cgatcore/pipeline/__init__.py
@@ -157,10 +157,13 @@ def loadData(infile, outfile):
 
 # Import existing pipeline functionality
 from cgatcore.pipeline.control import *
+from cgatcore.pipeline.database import *
 from cgatcore.pipeline.files import *
 from cgatcore.pipeline.cluster import *
-from cgatcore.pipeline.parameters import *
+from cgatcore.pipeline.execution import *
 from cgatcore.pipeline.utils import *
+from cgatcore.pipeline.parameters import *
+
 
 # Import original Ruffus decorators
 from ruffus import (
diff --git a/tests/template_pipeline.py b/tests/template_pipeline.py
index 451b9b68..65ff4e22 100644
--- a/tests/template_pipeline.py
+++ b/tests/template_pipeline.py
@@ -37,7 +37,7 @@
 import ruffus
 import numpy.random
 import cgatcore.experiment as E
-import cgatcore.pipeline as P
+from cgatcore import pipeline as P
 
 
 def create_files(outfile):