diff --git a/libhive/device.cpp b/libhive/device.cpp
index 23268d7a..7b486fa2 100644
--- a/libhive/device.cpp
+++ b/libhive/device.cpp
@@ -52,3 +52,13 @@ void Device::setParams(const QVariantMap &params)
 {
     m_params = params;
 }
+
+QList<State> Device::states() const
+{
+    return m_states;
+}
+
+void Device::setStates(const QList<State> &states)
+{
+    m_states = states;
+}
diff --git a/libhive/device.h b/libhive/device.h
index 70250457..1a615f14 100644
--- a/libhive/device.h
+++ b/libhive/device.h
@@ -1,8 +1,7 @@
 #ifndef DEVICE_H
 #define DEVICE_H
 
-#include "trigger.h"
-#include "action.h"
+#include "state.h"
 
 #include <QObject>
 #include <QUuid>
@@ -25,6 +24,9 @@ public:
     QVariantMap params() const;
     void setParams(const QVariantMap &params);
 
+    QList<State> states() const;
+    void setStates(const QList<State> &states);
+
 private:
     Device(const QUuid &pluginId, const QUuid &id, const QUuid &deviceClassId, QObject *parent = 0);
     Device(const QUuid &pluginId, const QUuid &deviceClassId, QObject *parent = 0);
@@ -35,6 +37,7 @@ private:
     QUuid m_pluginId;
     QString m_name;
     QVariantMap m_params;
+    QList<State> m_states;
 };
 
 #endif
diff --git a/libhive/deviceplugin.cpp b/libhive/deviceplugin.cpp
index d26b302a..2541d64c 100644
--- a/libhive/deviceplugin.cpp
+++ b/libhive/deviceplugin.cpp
@@ -5,7 +5,8 @@
 
 #include <QDebug>
 
-DevicePlugin::DevicePlugin()
+DevicePlugin::DevicePlugin():
+    m_deviceManager(0)
 {
 
 }