diff --git a/app.py b/app.py
index 61fb35c..5f9745e 100644
--- a/app.py
+++ b/app.py
@@ -2,10 +2,9 @@
 # See DSpace Solr docs for tips about parameters
 # https://wiki.duraspace.org/display/DSPACE/Solr
 
-from config import SOLR_SERVER
 from config import SOLR_CORE
 import falcon
-from SolrClient import SolrClient
+from solr import solr_connection
 
 
 class ItemResource:
@@ -14,8 +13,6 @@ class ItemResource:
         # Return HTTPBadRequest if id parameter is not present and valid
         item_id = req.get_param_as_int("id", required=True, min=0)
 
-        solr = SolrClient(SOLR_SERVER)
-
         # Get views
         res = solr.query(SOLR_CORE, {
             'q':'type:2 AND id:{0}'.format(item_id),
diff --git a/solr.py b/solr.py
new file mode 100644
index 0000000..e2677b7
--- /dev/null
+++ b/solr.py
@@ -0,0 +1,9 @@
+from config import SOLR_SERVER
+from SolrClient import SolrClient
+
+def solr_connection():
+    connection = SolrClient(SOLR_SERVER)
+
+    return connection
+
+# vim: set sw=4 ts=4 expandtab: