diff --git a/Cargo.lock b/Cargo.lock
index 83888da5d..80a0117b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,7 +4,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -15,6 +15,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "fst"
 version = "0.3.0"
+source = "git+https://github.com/Kerollmops/fst.git?branch=op-builder-with-state#6e0ab4e4ee5443cc55079996bf9f703086322c33"
 dependencies = [
  "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -55,14 +56,14 @@ name = "raptor"
 version = "0.1.0"
 dependencies = [
  "bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "fst 0.3.0",
- "serde 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fst 0.3.0 (git+https://github.com/Kerollmops/fst.git?branch=op-builder-with-state)",
+ "serde 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.45"
+version = "1.0.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -112,11 +113,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [metadata]
 "checksum bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bda13183df33055cbb84b847becce220d392df502ebe7a4a78d7021771ed94d0"
 "checksum byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "73b5bdfe7ee3ad0b99c9801d58807a9dbc9e09196365b0203853b99889ab3c87"
+"checksum fst 0.3.0 (git+https://github.com/Kerollmops/fst.git?branch=op-builder-with-state)" = "<none>"
 "checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b"
 "checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff"
 "checksum proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7"
 "checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
-"checksum serde 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "6a49d806123bcdaacdefe7aab3721c64ec11d05921bf64d888a857d3a92024a0"
+"checksum serde 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)" = "db9c1726bdebaed7ac8afb7028672e068e12cf1b0b97cddd742a3a7939159699"
 "checksum serde_derive 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5121751b76f5a2e6f51b4c0d07976f4f04e33ae7a981467c2845e7cd4b67a114"
 "checksum syn 0.13.9 (registry+https://github.com/rust-lang/crates.io-index)" = "505550dded6ff93eb63bd9d0ada380ffccd9f51c046a5e80a3078d53fcef0038"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
diff --git a/Cargo.toml b/Cargo.toml
index 69b9b688a..7bf4fda09 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,9 +9,5 @@ serde = "1.0"
 serde_derive = "1.0"
 
 [dependencies.fst]
-path = "../../fst"
-# git = "https://github.com/Kerollmops/fst.git"
-# branch = "stream-with-state"
-
-# [profile.release]
-# lto = true
+git = "https://github.com/Kerollmops/fst.git"
+branch = "op-builder-with-state"
diff --git a/raptor-bin/Cargo.toml b/raptor-bin/Cargo.toml
index e3cd428d2..dde1a965d 100644
--- a/raptor-bin/Cargo.toml
+++ b/raptor-bin/Cargo.toml
@@ -8,3 +8,6 @@ raptor = { path = ".." }
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
+
+[profile.release]
+# lto = true
diff --git a/raptor-http/Cargo.toml b/raptor-http/Cargo.toml
index 70c82ff82..0c1a63a68 100644
--- a/raptor-http/Cargo.toml
+++ b/raptor-http/Cargo.toml
@@ -15,12 +15,13 @@ tokio-service = "0.1"
 url = "1.7"
 
 [dependencies.levenshtein_automata]
-path = "../../../levenshtein-automata"
-# git = "https://github.com/Kerollmops/levenshtein-automata.git"
-# branch = "custom-fst"
-features = ["fst_automaton"]
+git = "https://github.com/Kerollmops/levenshtein-automata.git"
+branch = "custom-fst"
+features = ["fst"]
 
 [dependencies.fst]
-path = "../../../fst"
-# git = "https://github.com/Kerollmops/fst.git"
-# branch = "stream-with-state"
+git = "https://github.com/Kerollmops/fst.git"
+branch = "op-builder-with-state"
+
+[profile.release]
+# lto = true