diff --git a/easycloud/modules/openstack_openstacksdk/manager.py b/easycloud/modules/openstack_openstacksdk/manager.py
index 0f7ec82e1c4800cf8aa1284714e282b4d6884d10..46df16ccba347fbe49b530b3ef0b1ee3dea23a65 100644
--- a/easycloud/modules/openstack_openstacksdk/manager.py
+++ b/easycloud/modules/openstack_openstacksdk/manager.py
@@ -24,24 +24,24 @@ class OpenStackInstance(Instance):
     """
 
     _NODE_STATUS_MAP = {
-        'BUILD': 'pending',
-        'REBUILD': 'pending',
-        'ACTIVE': 'running',
-        'SUSPENDED': 'suspended',
-        'SHUTOFF': 'stopped',
-        'DELETED': 'terminated',
-        'QUEUE_RESIZE': 'pending',
-        'PREP_RESIZE': 'pending',
-        'VERIFY_RESIZE': 'running',
-        'PASSWORD': 'pending',
-        'RESCUE': 'pending',
-        'REBOOT': 'rebooting',
-        'HARD_REBOOT': 'rebooting',
-        'SHARE_IP': 'pending',
-        'SHARE_IP_NO_CONFIG': 'pending',
-        'DELETE_IP': 'pending',
-        'ERROR': 'error',
-        'UNKNOWN': 'unknown'
+        'BUILD': InstanceStatus.PENDING,
+        'REBUILD': InstanceStatus.PENDING,
+        'ACTIVE': InstanceStatus.RUNNING,
+        'SUSPENDED': InstanceStatus.SUSPENDED,
+        'SHUTOFF': InstanceStatus.STOPPED,
+        'DELETED': InstanceStatus.TERMINATED,
+        'QUEUE_RESIZE': InstanceStatus.PENDING,
+        'PREP_RESIZE': InstanceStatus.PENDING,
+        'VERIFY_RESIZE': InstanceStatus.RUNNING,
+        'PASSWORD': InstanceStatus.PENDING,
+        'RESCUE': InstanceStatus.PENDING,
+        'REBOOT': InstanceStatus.REBOOTING,
+        'HARD_REBOOT': InstanceStatus.REBOOTING,
+        'SHARE_IP': InstanceStatus.PENDING,
+        'SHARE_IP_NO_CONFIG': InstanceStatus.PENDING,
+        'DELETE_IP': InstanceStatus.PENDING,
+        'ERROR': InstanceStatus.ERROR,
+        'UNKNOWN': InstanceStatus.UNKNOWN
     }
 
     def __init__(self, os_conn, os_instance):
@@ -88,9 +88,11 @@ class OpenStackInstance(Instance):
 
     def start(self):
         self._os_conn.compute.start_server(self._os_inst)
+        #TODO: call "self._os_conn.compute.wait_for_server(self._os_inst, status='ACTIVE', wait = timeout)" to perform a synchronous version of this method (note, if timeout is None you should invoke this method without the "wait" parameter, catching the "ResourceTimeout" exception and, in case such an exception is thrown, calling again the "wait_for_server()" method)
 
     def stop(self):
         self._os_conn.compute.stop_server(self._os_inst)
+        #TODO: call "self._os_conn.compute.wait_for_server(self._os_inst, status='ACTIVE', wait = timeout)" to perform a synchronous version of this method (note, if timeout is None you should invoke this method without the "wait" parameter, catching the "ResourceTimeout" exception and, in case such an exception is thrown, calling again the "wait_for_server()" method)
 
 
 class OpenStack(MetaManager):