diff --git a/cli.py b/cli.py
index 371d5283..2cadec93 100755
--- a/cli.py
+++ b/cli.py
@@ -113,8 +113,8 @@ def init_cli_connect():
     @click.option('--mapping', default=None)
     def connect(mapping, receiver, emitter):
         print 'Connect', emitter, receiver
-        emitter = db.get_obj_resource(emitter)
-        receiver = db.get_obj_resource(receiver)
+        emitter = xr.load(emitter)
+        receiver = xr.load(receiver)
         print emitter
         print receiver
         if mapping is not None:
@@ -128,8 +128,8 @@ def init_cli_connect():
     @click.argument('receiver')
     def disconnect(receiver, emitter):
         print 'Disconnect', emitter, receiver
-        emitter = db.get_obj_resource(emitter)
-        receiver = db.get_obj_resource(receiver)
+        emitter = xr.load(emitter)
+        receiver = xr.load(receiver)
         print emitter
         print receiver
         xs.disconnect(emitter, receiver)
diff --git a/solar/solar/cli.py b/solar/solar/cli.py
index b5a4493c..3a25a237 100644
--- a/solar/solar/cli.py
+++ b/solar/solar/cli.py
@@ -88,14 +88,14 @@ class Cmd(object):
 
     def run(self, args):
         from solar.core import actions
-        from solar.core import signals
+        from solar.core import resource
 
         resources = filter(
             lambda r: Expression(args.tags, r.get('tags', [])).evaluate(),
             self.db.get_list('resource'))
 
         for resource in resources:
-            resource_obj = self.db.get_obj_resource(resource['id'])
+            resource_obj = resource.load(resource['id'])
             actions.resource_action(resource_obj, args.action)
 
     def profile(self, args):
diff --git a/solar/solar/operations.py b/solar/solar/operations.py
index 545b6337..a3e753fc 100644
--- a/solar/solar/operations.py
+++ b/solar/solar/operations.py
@@ -167,7 +167,7 @@ def rollback(log_item):
         log_item.res, df, guess_action(commited, staged))
     log.add(log_item)
 
-    res = db.get_obj_resource(log_item.res)
+    res = resource.load(log_item.res)
     res.update(staged.get('args', {}))
     res.save()
 
diff --git a/solar/solar/state.py b/solar/solar/state.py
index f3828c69..0f3af6c2 100644
--- a/solar/solar/state.py
+++ b/solar/solar/state.py
@@ -23,12 +23,10 @@ from enum import Enum
 
 from solar.interfaces.db import get_db
 
-import yaml
-
 db = get_db()
 
 
-STATES = Enum('States', 'pending inprogress error success')
+STATES = Enum('States', 'error inprogress pending success')
 
 
 def state_file(name):
@@ -107,7 +105,7 @@ class Log(object):
         return item
 
     def show(self, verbose=False):
-        return ['L(uuid={0}, res={1}, aciton={2})'.format(
+        return ['L(uuid={0}, res={1}, action={2})'.format(
             l.uid, l.res, l.action) for l in self.items]
 
     def __repr__(self):