diff --git a/src/app.js b/src/app.js
index 6d87988493..f3ade5eea8 100644
--- a/src/app.js
+++ b/src/app.js
@@ -340,8 +340,9 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   self._components.compiler = new Compiler(importFileCb)
   var compiler = self._components.compiler
   registry.put({api: compiler, name: 'compiler'})
-  var offsetToLineColumnConverter = new OffsetToLineColumnConverter(compiler.event)
 
+  var offsetToLineColumnConverter = new OffsetToLineColumnConverter(compiler.event)
+  registry.put({api: offsetToLineColumnConverter, name: 'offsetToLineColumnConverter'})
   // ----------------- UniversalDApp -----------------
   var transactionContextAPI = {
     getAddress: (cb) => {
@@ -506,51 +507,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   registry.put({api: editor, name: 'editor'})
 
   // ---------------- ContextualListener -----------------------
-  this._components.contextualListener = new ContextualListener({
-    getCursorPosition: () => {
-      return this._components.editor.getCursorPosition()
-    },
-    getCompilationResult: () => {
-      return compiler.lastCompilationResult
-    },
-    getCurrentFile: () => {
-      return config.get('currentFile')
-    },
-    getSourceName: (index) => {
-      return compiler.getSourceName(index)
-    },
-    highlight: (position, node) => {
-      if (compiler.lastCompilationResult && compiler.lastCompilationResult.data) {
-        var lineColumn = offsetToLineColumnConverter.offsetToLineColumn(position, position.file, compiler.lastCompilationResult)
-        var css = 'highlightreference'
-        if (node.children && node.children.length) {
-          // If node has children, highlight the entire line. if not, just highlight the current source position of the node.
-          css = 'highlightreference'
-          lineColumn = {
-            start: {
-              line: lineColumn.start.line,
-              column: 0
-            },
-            end: {
-              line: lineColumn.start.line + 1,
-              column: 0
-            }
-          }
-        }
-        var fileName = compiler.getSourceName(position.file)
-        if (fileName) {
-          return editor.addMarker(lineColumn, fileName, css)
-        }
-      }
-      return null
-    },
-    stopHighlighting: (event) => {
-      editor.removeMarker(event.eventId, event.fileTarget)
-    }
-  }, {
-    compiler: compiler.event,
-    editor: editor.event
-  })
+  this._components.contextualListener = new ContextualListener()
 
   // ---------------- ContextView -----------------------
   this._components.contextView = new ContextView({
diff --git a/src/app/editor/contextualListener.js b/src/app/editor/contextualListener.js
index 4f2ea3865d..903aa91d3f 100644
--- a/src/app/editor/contextualListener.js
+++ b/src/app/editor/contextualListener.js
@@ -3,21 +3,30 @@ var remixLib = require('remix-lib')
 var SourceMappingDecoder = remixLib.SourceMappingDecoder
 var AstWalker = remixLib.AstWalker
 var EventManager = remixLib.EventManager
+var globalRegistry = require('../../global/registry')
 
 /*
   trigger contextChanged(nodes)
 */
 class ContextualListener {
-  constructor (api, events) {
+  constructor (localRegistry) {
+    var self = this
     this.event = new EventManager()
-    this._api = api
+    self._components = {}
+    self._components.registry = localRegistry || globalRegistry
+    self._deps = {
+      compiler: self._components.registry.get('compiler').api,
+      editor: self._components.registry.get('editor').api,
+      config: self._components.registry.get('config').api,
+      offsetToLineColumnConverter: self._components.registry.get('offsetToLineColumnConverter').api
+    }
     this._index = {
       Declarations: {},
       FlatReferences: {}
     }
     this._activeHighlights = []
 
-    events.compiler.register('compilationFinished', (success, data, source) => {
+    self._deps.compiler.event.register('compilationFinished', (success, data, source) => {
       this._stopHighlighting()
       this._index = {
         Declarations: {},
@@ -28,12 +37,12 @@ class ContextualListener {
       }
     })
 
-    events.editor.register('contentChanged', () => { this._stopHighlighting() })
+    self._deps.editor.event.register('contentChanged', () => { this._stopHighlighting() })
 
     this.sourceMappingDecoder = new SourceMappingDecoder()
     this.astWalker = new AstWalker()
     setInterval(() => {
-      this._highlightItems(api.getCursorPosition(), api.getCompilationResult(), api.getCurrentFile())
+      this._highlightItems(self._deps.editor.getCursorPosition(), self._deps.compiler.lastCompilationResult, self._deps.config.get('currentFile'))
     }, 1000)
   }
 
@@ -94,13 +103,41 @@ class ContextualListener {
 
   _highlight (node, compilationResult) {
     if (!node) return
+    var self = this
     var position = this.sourceMappingDecoder.decode(node.src)
-    var eventId = this._api.highlight(position, node)
+    var eventId = this._highlightInternal(position, node)
     if (eventId) {
-      this._activeHighlights.push({ eventId, position, fileTarget: this._api.getSourceName(position.file), nodeId: node.id })
+      this._activeHighlights.push({ eventId, position, fileTarget: self._deps.compiler.getSourceName(position.file), nodeId: node.id })
     }
   }
 
+  _highlightInternal (position, node) {
+    var self = this
+    if (self._deps.compiler.lastCompilationResult && self._deps.compiler.lastCompilationResult.data) {
+      var lineColumn = self._deps.offsetToLineColumnConverter.offsetToLineColumn(position, position.file, self._deps.compiler.lastCompilationResult)
+      var css = 'highlightreference'
+      if (node.children && node.children.length) {
+        // If node has children, highlight the entire line. if not, just highlight the current source position of the node.
+        css = 'highlightreference'
+        lineColumn = {
+          start: {
+            line: lineColumn.start.line,
+            column: 0
+          },
+          end: {
+            line: lineColumn.start.line + 1,
+            column: 0
+          }
+        }
+      }
+      var fileName = self._deps.compiler.getSourceName(position.file)
+      if (fileName) {
+        return self._deps.editor.addMarker(lineColumn, fileName, css)
+      }
+    }
+    return null
+  }
+
   _highlightExpressions (node, compilationResult) {
     var self = this
     function highlights (id) {
@@ -124,8 +161,10 @@ class ContextualListener {
   }
 
   _stopHighlighting () {
-    for (var event in this._activeHighlights) {
-      this._api.stopHighlighting(this._activeHighlights[event])
+    var self = this
+    for (var eventKey in this._activeHighlights) {
+      var event = this._activeHighlights[eventKey]
+      self._deps.editor.removeMarker(event.eventId, event.fileTarget)
     }
     this._activeHighlights = []
   }