diff --git a/deps/build.jl b/deps/build.jl
index 9855e2ca82b5309abcf16c7ccb50e502b9b902b9..7634b5340402feec8a31b41778eb69f1335f0170 100644
--- a/deps/build.jl
+++ b/deps/build.jl
@@ -3,7 +3,7 @@ using BinaryProvider
 const verbose = "--verbose" in ARGS
 const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr")))
 
-PREPROCESSOR_VERSION = "5727083865753f5abde8bdc0c20eee2b1ed5a501"
+PREPROCESSOR_VERSION = "c4ae840b207dbc4e61bff315e8eaa28fb742d9ea"
 REMOTE_PATH = "https://dynare.adjemian.eu/preprocessor/$PREPROCESSOR_VERSION"
 
 products = Product[
@@ -11,14 +11,14 @@ products = Product[
 ]
 
 download_info = Dict(
-    Linux(:i686, :glibc)    => ("$REMOTE_PATH/linux/32/preprocessor.tar.gz", "291427358c08e23f7fb7816e5329892695b761c7d7403c9799d13bf6d58fa1a3"),
-    Linux(:x86_64, :glibc)  => ("$REMOTE_PATH/linux/64/preprocessor.tar.gz", "b82876a77e819ad89dc7183ab32c0c802a0c2c44b33cc10ec03a647094fb7fd6"),
-    MacOS()                 => ("$REMOTE_PATH/osx/64/preprocessor.tar.gz", "e88764e0641fb79bb0f8dbcf06902fc0b698b642a287800e2170a927999321b0"),
-    Windows(:i686)          => ("$REMOTE_PATH/windows/32/preprocessor.tar.gz", "8834fbddf862a2546123e188cb1adafab3fa36a7df6950bb326eb743e55afd75"),
-    Windows(:x86_64)        => ("$REMOTE_PATH/windows/64/preprocessor.tar.gz", "cfd2eb6bda76c50dd4d2fb789377897859a98925c69158d9adf39dc2deba5cbf"),
+    Linux(:i686, :glibc)    => ("$REMOTE_PATH/linux/32/preprocessor.tar.gz", "4971c8443a2a4347b90a002baeab4972857f9dd2863c6b9c646b6d0e399a6f7f"),
+    Linux(:x86_64, :glibc)  => ("$REMOTE_PATH/linux/64/preprocessor.tar.gz", "f72b592b910283b141fb3ac0b7435b9dca1133bdaa710bf731150cbd45e77b08"),
+    MacOS()                 => ("$REMOTE_PATH/osx/64/preprocessor.tar.gz", "d6b4dea63249996c45dc6249014f796359416e9e16019ab0c01a4c64ec5005a2"),
+    Windows(:i686)          => ("$REMOTE_PATH/windows/32/preprocessor.tar.gz", "10c4aa274ace85420d7fbf75fe7239ae8e5accf3d479bbd8f431359650940b56"),
+    Windows(:x86_64)        => ("$REMOTE_PATH/windows/64/preprocessor.tar.gz", "66805c5fb097f6972dadaf2f1560555e2c1e51fa4635750b5bfafb23a9ef54d7"),
 )
 
-if any(!satisfied(p; verbose=verbose) for p in products)
+for p in products
     if platform_key() in keys(download_info)
         url, tarball_hash = download_info[platform_key()]
         install(url, tarball_hash; prefix=prefix, force=true, verbose=true, ignore_platform=true)
diff --git a/src/DynareModel.jl b/src/DynareModel.jl
index 8d2d3a94a8e13f8db5914dc5e4da444cbadf6763..14cf71cfe9b76a45749c3457f495e21f2279e958 100644
--- a/src/DynareModel.jl
+++ b/src/DynareModel.jl
@@ -82,9 +82,13 @@ type Model
     dname::String
     dynare_version::String
     endo::Vector{Endo}
+    endo_nbr::Int
     exo::Vector{Exo}
+    exo_nbr::Int
     exo_det::Vector{ExoDet}
+    exo_det_nbr::Int
     param::Vector{Param}
+    param_nbr::Int
     aux_vars::Vector{AuxVars}
     pred_vars::Vector{Int}
     obs_vars::Vector{Int}
@@ -140,9 +144,13 @@ function dynare_model()
                  "",                    # dname
                  "",                    # dynare_version
                  Vector{Endo}(),        # endo
+                 0,                     # endo_nbr
                  Vector{Exo}(),         # exo
+                 0,                     # exo_nbr
                  Vector{ExoDet}(),      # exo_det
+                 0,                     # exo_det_nbr
                  Vector{Param}(),       # param
+                 0,                     # param_nbr
                  Vector{AuxVars}(),     # aux_vars
                  Vector{Int}(),         # pred_vars
                  Vector{Int}(),         # obs_vars