diff --git a/python/devsup/_nullapi.py b/python/devsup/_nullapi.py
index dce02f2..ee1a286 100644
--- a/python/devsup/_nullapi.py
+++ b/python/devsup/_nullapi.py
@@ -49,7 +49,7 @@ class _Record(object):
     def asyncFinish(self, reason=None):
         pass
 
-def _Field(object):
+class _Field(object):
     """Handle for field operations
     
     f = Field("rec:name.HOPR")
@@ -84,3 +84,5 @@ def _Field(object):
     def getarray(self):
         """Return a numpy ndarray refering to this field for in-place operations.
         """
+
+_hooks = {}
diff --git a/python/devsup/hooks.py b/python/devsup/hooks.py
index 7abb6e9..460fd62 100644
--- a/python/devsup/hooks.py
+++ b/python/devsup/hooks.py
@@ -2,7 +2,6 @@ try:
     import _dbapi
 except ImportError:
     import _nullapi as _dbapi
-from _dbapi import _hooks, _hooktable
 
 __all__ = [
     "hooknames",
@@ -10,7 +9,7 @@ __all__ = [
     "debugHooks",
 ]
 
-hooknames = _hooks.keys()
+hooknames = _dbapi._hooks.keys()
 
 def addHook(state, func):
     """addHook("stats", funcion)
@@ -20,12 +19,12 @@ def addHook(state, func):
         print 'State Occurred'
     addHook("AfterIocRunning", show)
     """
-    sid = _hooks[state]
+    sid = _dbapi._hooks[state]
     try:
-        slist = _hooktable[sid]
+        slist = _dbapi._hooktable[sid]
     except KeyError:
         slist = []
-        _hooktable[sid] = slist
+        _dbapi._hooktable[sid] = slist
 
     slist.append(func)