diff --git a/Cargo.lock b/Cargo.lock
index 6483f838..fd9ff198 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -222,6 +222,14 @@ dependencies = [
  "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "filetime"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "foxbox_core"
 version = "0.1.0"
@@ -291,6 +299,24 @@ dependencies = [
  "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "fsevent"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fsevent-sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fsevent-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "gcc"
 version = "0.3.28"
@@ -363,6 +389,14 @@ dependencies = [
  "unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "inotify"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "iron"
 version = "0.3.0"
@@ -604,6 +638,25 @@ name = "nom"
 version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "notify"
+version = "2.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fsevent 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fsevent-sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "inotify 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "walkdir 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "num"
 version = "0.1.32"
@@ -700,16 +753,17 @@ version = "0.1.0"
 dependencies = [
  "foxbox_taxonomy 0.2.0",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "openzwave-stateful 0.1.0 (git+https://github.com/fxbox/openzwave-stateful-rust?rev=481baff1d7671dd44df00a00b9c008550407aecb)",
+ "openzwave-stateful 0.1.0 (git+https://github.com/fxbox/openzwave-stateful-rust)",
  "transformable_channels 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "openzwave-stateful"
 version = "0.1.0"
-source = "git+https://github.com/fxbox/openzwave-stateful-rust?rev=481baff1d7671dd44df00a00b9c008550407aecb#481baff1d7671dd44df00a00b9c008550407aecb"
+source = "git+https://github.com/fxbox/openzwave-stateful-rust#38eb4284c52bc04a3169e4dd4e1f4960a0d6122e"
 dependencies = [
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "notify 2.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "openzwave 0.1.0 (git+https://github.com/fxbox/openzwave-rust)",
  "serial_ports 0.1.1 (git+https://github.com/dhylands/serial-ports-rs)",
 ]
@@ -1218,6 +1272,15 @@ name = "void"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "walkdir"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "winapi"
 version = "0.2.7"
diff --git a/components/openzwave-adapter/Cargo.toml b/components/openzwave-adapter/Cargo.toml
index e7fd5864..fe26573a 100644
--- a/components/openzwave-adapter/Cargo.toml
+++ b/components/openzwave-adapter/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Julien Wajsberg <felash@gmail.com>"]
 
 [dependencies]
-openzwave-stateful = { git = "https://github.com/fxbox/openzwave-stateful-rust", rev = "481baff1d7671dd44df00a00b9c008550407aecb" }
+openzwave-stateful = { git = "https://github.com/fxbox/openzwave-stateful-rust" }
 foxbox_taxonomy = { path = "../taxonomy/" }
 transformable_channels = "^0.1"
 log = "^0.3"
diff --git a/components/openzwave-adapter/src/lib.rs b/components/openzwave-adapter/src/lib.rs
index 11c54a37..d99aaa88 100644
--- a/components/openzwave-adapter/src/lib.rs
+++ b/components/openzwave-adapter/src/lib.rs
@@ -208,7 +208,7 @@ pub struct OpenzwaveAdapter {
     name: String,
     vendor: String,
     version: [u32; 4],
-    ozw: ZWaveManager,
+    ozw: Arc<ZWaveManager>,
     node_map: IdMap<ServiceId, Node>,
     getter_map: IdMap<Channel, ValueID>,
     setter_map: IdMap<Channel, ValueID>,