diff --git a/.github/actions/setup-amici-cpp/action.yml b/.github/actions/setup-amici-cpp/action.yml
index 09ec9311bf..b5ee4808b8 100644
--- a/.github/actions/setup-amici-cpp/action.yml
+++ b/.github/actions/setup-amici-cpp/action.yml
@@ -18,6 +18,9 @@ runs:
     - run: echo "ENABLE_GCOV_COVERAGE=TRUE" >> $GITHUB_ENV
       shell: bash
 
+    - run: echo "PYTHONFAULTHANDLER=1" >> $GITHUB_ENV
+      shell: bash
+
     - name: Set up Sonar tools
       uses: ./.github/actions/setup-sonar-tools
 
diff --git a/include/amici/abstract_model.h b/include/amici/abstract_model.h
index d88347078d..f340214e7e 100644
--- a/include/amici/abstract_model.h
+++ b/include/amici/abstract_model.h
@@ -820,11 +820,15 @@ class AbstractModel {
      * @param h Heaviside vector
      * @param tcl total abundances for conservation laws
      * @param spl spline value vector
+     * @param include_static Whether to (re-)evaluate only dynamic expressions
+     * (false) or also static expressions (true).
+     * Dynamic expressions are those that depend directly or indirectly on time,
+     * static expressions are those that don't.
      */
     virtual void
     fw(realtype* w, realtype const t, realtype const* x, realtype const* p,
        realtype const* k, realtype const* h, realtype const* tcl,
-       realtype const* spl);
+       realtype const* spl, bool include_static = true);
 
     /**
      * @brief Model-specific sparse implementation of dwdp
@@ -840,12 +844,16 @@ class AbstractModel {
      * @param spl spline value vector
      * @param sspl sensitivities of spline values vector w.r.t. parameters \f$ p
      * \f$
+     * @param include_static Whether to (re-)evaluate only dynamic expressions
+     * (false) or also static expressions (true).
+     * Dynamic expressions are those that depend directly or indirectly on time,
+     * static expressions are those that don't.
      */
     virtual void fdwdp(
         realtype* dwdp, realtype const t, realtype const* x, realtype const* p,
         realtype const* k, realtype const* h, realtype const* w,
         realtype const* tcl, realtype const* stcl, realtype const* spl,
-        realtype const* sspl
+        realtype const* sspl, bool include_static = true
     );
 
     /**
@@ -860,28 +868,6 @@ class AbstractModel {
      */
     virtual void fdwdp_rowvals(SUNMatrixWrapper& dwdp);
 
-    /**
-     * @brief Model-specific sensitivity implementation of dwdp
-     * @param dwdp Recurring terms in xdot, parameter derivative
-     * @param t timepoint
-     * @param x vector with the states
-     * @param p parameter vector
-     * @param k constants vector
-     * @param h Heaviside vector
-     * @param w vector with helper variables
-     * @param tcl total abundances for conservation laws
-     * @param stcl sensitivities of total abundances for conservation laws
-     * @param spl spline value vector
-     * @param sspl sensitivities of spline values vector
-     * @param ip sensitivity parameter index
-     */
-    virtual void fdwdp(
-        realtype* dwdp, realtype const t, realtype const* x, realtype const* p,
-        realtype const* k, realtype const* h, realtype const* w,
-        realtype const* tcl, realtype const* stcl, realtype const* spl,
-        realtype const* sspl, int ip
-    );
-
     /**
      * @brief Model-specific implementation of dwdx, data part
      * @param dwdx Recurring terms in xdot, state derivative
@@ -893,11 +879,15 @@ class AbstractModel {
      * @param w vector with helper variables
      * @param tcl total abundances for conservation laws
      * @param spl spline value vector
+     * @param include_static Whether to (re-)evaluate only dynamic expressions
+     * (false) or also static expressions (true).
+     * Dynamic expressions are those that depend directly or indirectly on time,
+     * static expressions are those that don't.
      */
     virtual void fdwdx(
         realtype* dwdx, realtype const t, realtype const* x, realtype const* p,
         realtype const* k, realtype const* h, realtype const* w,
-        realtype const* tcl, realtype const* spl
+        realtype const* tcl, realtype const* spl, bool include_static = true
     );
 
     /**
@@ -922,11 +912,15 @@ class AbstractModel {
      * @param h Heaviside vector
      * @param w vector with helper variables
      * @param tcl Total abundances for conservation laws
+     * @param include_static Whether to (re-)evaluate only dynamic expressions
+     * (false) or also static expressions (true).
+     * Dynamic expressions are those that depend directly or indirectly on time,
+     * static expressions are those that don't.
      */
     virtual void fdwdw(
         realtype* dwdw, realtype t, realtype const* x, realtype const* p,
         realtype const* k, realtype const* h, realtype const* w,
-        realtype const* tcl
+        realtype const* tcl, bool include_static = true
     );
 
     /**
diff --git a/include/amici/model.h b/include/amici/model.h
index 23f6ac63c8..13de007e00 100644
--- a/include/amici/model.h
+++ b/include/amici/model.h
@@ -239,6 +239,18 @@ class Model : public AbstractModel, public ModelDimensions {
         bool computeSensitivities, std::vector<int>& roots_found
     );
 
+    /**
+     * @brief Re-initialize model properties after changing simulation context.
+     * @param t Timepoint
+     * @param x Reference to state variables
+     * @param sx Reference to state variable sensitivities
+     * @param computeSensitivities Flag indicating whether sensitivities are to
+     * be computed
+     */
+    void reinitialize(
+        realtype t, AmiVector& x, AmiVectorArray& sx, bool computeSensitivities
+    );
+
     /**
      * @brief Initialize model properties.
      * @param xB Adjoint state variables
@@ -1828,29 +1840,45 @@ class Model : public AbstractModel, public ModelDimensions {
      * @brief Compute recurring terms in xdot.
      * @param t Timepoint
      * @param x Array with the states
+     * @param include_static Whether to (re-)evaluate only dynamic expressions
+     * (false) or also static expressions (true).
+     * Dynamic expressions are those that depend directly or indirectly on time,
+     * static expressions are those that don't.
      */
-    void fw(realtype t, realtype const* x);
+    void fw(realtype t, realtype const* x, bool include_static = true);
 
     /**
      * @brief Compute parameter derivative for recurring terms in xdot.
      * @param t Timepoint
      * @param x Array with the states
+     * @param include_static Whether to (re-)evaluate only dynamic expressions
+     * (false) or also static expressions (true).
+     * Dynamic expressions are those that depend directly or indirectly on time,
+     * static expressions are those that don't.
      */
-    void fdwdp(realtype t, realtype const* x);
+    void fdwdp(realtype t, realtype const* x, bool include_static = true);
 
     /**
      * @brief Compute state derivative for recurring terms in xdot.
      * @param t Timepoint
      * @param x Array with the states
+     * @param include_static Whether to (re-)evaluate only dynamic expressions
+     * (false) or also static expressions (true).
+     * Dynamic expressions are those that depend directly or indirectly on time,
+     * static expressions are those that don't.
      */
-    void fdwdx(realtype t, realtype const* x);
+    void fdwdx(realtype t, realtype const* x, bool include_static = true);
 
     /**
      * @brief Compute self derivative for recurring terms in xdot.
      * @param t Timepoint
      * @param x Array with the states
+     * @param include_static Whether to (re-)evaluate only dynamic expressions
+     * (false) or also static expressions (true).
+     * Dynamic expressions are those that depend directly or indirectly on time,
+     * static expressions are those that don't.
      */
-    void fdwdw(realtype t, realtype const* x);
+    void fdwdw(realtype t, realtype const* x, bool include_static = true);
 
     /**
      * @brief Compute fx_rdata.
diff --git a/matlab/@amifun/getArgs.m b/matlab/@amifun/getArgs.m
index afb50802e0..a34c658ee5 100644
--- a/matlab/@amifun/getArgs.m
+++ b/matlab/@amifun/getArgs.m
@@ -108,11 +108,11 @@
         case 'dJrzdsigma'
             this.argstr = '(double *dJrzdsigma, const int iz, const realtype *p, const realtype *k, const double *rz, const double *sigmaz)';
         case 'w'
-            this.argstr = '(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl)';
+            this.argstr = '(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static)';
         case 'dwdp'
-            this.argstr = '(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl)';
+            this.argstr = '(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static)';
         case 'dwdx'
-            this.argstr = '(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl)';
+            this.argstr = '(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static)';
         case 'M'
             this.argstr = '(realtype *M, const realtype t, const realtype *x, const realtype *p, const realtype *k)';
         otherwise
diff --git a/matlab/@amimodel/generateC.m b/matlab/@amimodel/generateC.m
index 869f386baf..2f09831b24 100644
--- a/matlab/@amimodel/generateC.m
+++ b/matlab/@amimodel/generateC.m
@@ -209,7 +209,7 @@ function generateC(this)
 end
 fprintf(fid,'};\n\n');
 fprintf(fid,['} // namespace model_' this.modelname '\n\n']);
-fprintf(fid,'} // namespace amici \n\n');
+fprintf(fid,'} // namespace amici\n\n');
 fprintf(fid,['#endif /* _amici_' this.modelname '_h */\n']);
 fclose(fid);
 
@@ -253,6 +253,7 @@ function generateC(this)
 
 argstr = strrep(argstr,'realtype','');
 argstr = strrep(argstr,'int','');
+argstr = strrep(argstr,'bool','');
 argstr = strrep(argstr,'const','');
 argstr = strrep(argstr,'double','');
 argstr = strrep(argstr,'SUNMatrixContent_Sparse','');
diff --git a/models/model_calvetti/CMakeLists.txt b/models/model_calvetti/CMakeLists.txt
index 2d1347b553..30262f7de3 100644
--- a/models/model_calvetti/CMakeLists.txt
+++ b/models/model_calvetti/CMakeLists.txt
@@ -1,5 +1,11 @@
 # Build AMICI model
 cmake_minimum_required(VERSION 3.15)
+cmake_policy(VERSION 3.15...3.27)
+
+# cmake >=3.27
+if(POLICY CMP0144)
+  cmake_policy(SET CMP0144 NEW)
+endif(POLICY CMP0144)
 
 project(model_calvetti)
 
@@ -14,7 +20,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 foreach(flag ${MY_CXX_FLAGS})
   unset(CUR_FLAG_SUPPORTED CACHE)
-  check_cxx_compiler_flag(-Werror ${flag} CUR_FLAG_SUPPORTED)
+  check_cxx_compiler_flag(${flag} CUR_FLAG_SUPPORTED)
   if(${CUR_FLAG_SUPPORTED})
     string(APPEND CMAKE_CXX_FLAGS " ${flag}")
   endif()
@@ -33,6 +39,23 @@ find_package(Amici  REQUIRED HINTS
              ${CMAKE_CURRENT_LIST_DIR}/../../build)
 message(STATUS "Found AMICI ${Amici_DIR}")
 
+# Debug build?
+if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
+  add_compile_options(-UNDEBUG)
+  if(MSVC)
+    add_compile_options(-DEBUG)
+  else()
+    add_compile_options(-O0 -g)
+  endif()
+  set(CMAKE_BUILD_TYPE "Debug")
+endif()
+
+# coverage options
+if($ENV{ENABLE_GCOV_COVERAGE})
+  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
+  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
+endif()
+
 set(MODEL_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 set(SRC_LIST_LIB ${MODEL_DIR}/JSparse.cpp
@@ -73,18 +96,6 @@ if(NOT "${AMICI_PYTHON_BUILD_EXT_ONLY}")
   target_link_libraries(simulate_${PROJECT_NAME} ${PROJECT_NAME})
 endif()
 
-# Debug build?
-if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
-  add_compile_options(-UNDEBUG -O0 -g)
-  set(CMAKE_BUILD_TYPE "Debug")
-endif()
-
-# coverage options
-if($ENV{ENABLE_GCOV_COVERAGE})
-  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
-endif()
-
 # SWIG
 option(ENABLE_SWIG "Build swig/python library?" ON)
 if(ENABLE_SWIG)
diff --git a/models/model_calvetti/dwdx.cpp b/models/model_calvetti/dwdx.cpp
index 9066d0e953..f185abd31f 100644
--- a/models/model_calvetti/dwdx.cpp
+++ b/models/model_calvetti/dwdx.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_calvetti{
 
-void dwdx_model_calvetti(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) {
+void dwdx_model_calvetti(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) {
   dwdx[0] = 1.0/(x[0]*x[0]*x[0])*-2.0;
   dwdx[1] = k[1]*w[15]*dwdx[0];
   dwdx[2] = dwdx[1];
diff --git a/models/model_calvetti/main.cpp b/models/model_calvetti/main.cpp
index 00a5e6b448..ecdff85a46 100644
--- a/models/model_calvetti/main.cpp
+++ b/models/model_calvetti/main.cpp
@@ -1,14 +1,13 @@
 #include <iostream>
 
-#include <amici/amici.h>    /* AMICI base functions */
-#include "wrapfunctions.h"  /* model-provided functions */
+#include "wrapfunctions.h" /* model-provided functions */
+#include <amici/amici.h>   /* AMICI base functions */
 
-template < class T >
-std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
-{
+template <class T>
+std::ostream& operator<<(std::ostream& os, std::vector<T> const& v) {
     os << "[";
-    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end(); ++ii)
-    {
+    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end();
+         ++ii) {
         os << " " << *ii;
     }
     os << "]";
@@ -21,9 +20,9 @@ std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
  */
 
 int main() {
-    std::cout<<"********************************"<<std::endl;
-    std::cout<<"** Running forward simulation **"<<std::endl;
-    std::cout<<"********************************"<<std::endl<<std::endl;
+    std::cout << "********************************" << std::endl;
+    std::cout << "** Running forward simulation **" << std::endl;
+    std::cout << "********************************" << std::endl << std::endl;
 
     // Create a model instance
     auto model = amici::generic_model::getModel();
@@ -44,21 +43,20 @@ int main() {
 
     // Print observable time course
     auto observable_ids = model->getObservableIds();
-    std::cout<<"Simulated observables for timepoints "<<rdata->ts<<"\n\n";
-    for(int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
-        std::cout<<observable_ids[i_observable]<<":\n\t";
-        for(int i_time = 0; i_time < rdata->nt; ++i_time) {
+    std::cout << "Simulated observables for timepoints " << rdata->ts << "\n\n";
+    for (int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
+        std::cout << observable_ids[i_observable] << ":\n\t";
+        for (int i_time = 0; i_time < rdata->nt; ++i_time) {
             // rdata->y is a flat 2D array in row-major ordering
-            std::cout<<rdata->y[i_time * rdata->ny + i_observable]<<" ";
+            std::cout << rdata->y[i_time * rdata->ny + i_observable] << " ";
         }
-        std::cout<<std::endl<<std::endl;
+        std::cout << std::endl << std::endl;
     }
 
-
-    std::cout<<std::endl;
-    std::cout<<"**********************************"<<std::endl;
-    std::cout<<"** Forward sensitivity analysis **"<<std::endl;
-    std::cout<<"**********************************"<<std::endl<<std::endl;
+    std::cout << std::endl;
+    std::cout << "**********************************" << std::endl;
+    std::cout << "** Forward sensitivity analysis **" << std::endl;
+    std::cout << "**********************************" << std::endl << std::endl;
 
     // Enable first-order sensitivity analysis
     solver->setSensitivityOrder(amici::SensitivityOrder::first);
@@ -78,18 +76,17 @@ int main() {
     auto state_ids = model->getStateIds();
     auto parameter_ids = model->getParameterIds();
 
-    std::cout<<"State sensitivities for timepoint "
-              <<rdata->ts[i_time]
-              <<std::endl;//nt x nplist x nx
-    for(int i_state= 0; i_state < rdata->nx; ++i_state) {
-        std::cout<<"\td("<<state_ids[i_state]<<")/d("
-                  <<parameter_ids[model->plist(i_nplist)]<<") = ";
+    std::cout << "State sensitivities for timepoint " << rdata->ts[i_time]
+              << std::endl; // nt x nplist x nx
+    for (int i_state = 0; i_state < rdata->nx; ++i_state) {
+        std::cout << "\td(" << state_ids[i_state] << ")/d("
+                  << parameter_ids[model->plist(i_nplist)] << ") = ";
 
         // rdata->sx is a flat 3D array in row-major ordering
-        std::cout<<rdata->sx[i_time * rdata->nplist * rdata->nx
-                              + i_nplist * rdata->nx
-                              + i_state];
-        std::cout<<std::endl;
+        std::cout << rdata->sx
+                         [i_time * rdata->nplist * rdata->nx
+                          + i_nplist * rdata->nx + i_state];
+        std::cout << std::endl;
     }
 
     return 0;
diff --git a/models/model_calvetti/model_calvetti.h b/models/model_calvetti/model_calvetti.h
index c8144bdf5e..c189ae8d74 100644
--- a/models/model_calvetti/model_calvetti.h
+++ b/models/model_calvetti/model_calvetti.h
@@ -1,6 +1,6 @@
 #ifndef _amici_model_calvetti_h
 #define _amici_model_calvetti_h
-/* Generated by amiwrap (R2017b) 223c5075608273b17f304556d0e8ccb41233bd21 */
+/* Generated by amiwrap (R2017b) 8b324bca5b796a93094195d22a023e5f8e945ef1 */
 #include <cmath>
 #include <memory>
 #include "amici/defines.h"
@@ -19,11 +19,11 @@ extern void Jy_model_calvetti(double *nllh, const int iy, const realtype *p, con
 extern void M_model_calvetti(realtype *M, const realtype t, const realtype *x, const realtype *p, const realtype *k);
 extern void dJydsigma_model_calvetti(double *dJydsigma, const int iy, const realtype *p, const realtype *k, const double *y, const double *sigmay, const double *my);
 extern void dJydy_model_calvetti(double *dJydy, const int iy, const realtype *p, const realtype *k, const double *y, const double *sigmay, const double *my);
-extern void dwdx_model_calvetti(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl);
+extern void dwdx_model_calvetti(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static);
 extern void dydx_model_calvetti(double *dydx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *dwdx);
 extern void root_model_calvetti(realtype *root, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *dx);
 extern void sigmay_model_calvetti(double *sigmay, const realtype t, const realtype *p, const realtype *k, const realtype *y);
-extern void w_model_calvetti(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl);
+extern void w_model_calvetti(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static);
 extern void x0_model_calvetti(realtype *x0, const realtype t, const realtype *p, const realtype *k);
 extern void xdot_model_calvetti(realtype *xdot, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *dx, const realtype *w);
 extern void y_model_calvetti(double *y, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w);
@@ -72,7 +72,7 @@ class Model_model_calvetti : public amici::Model_DAE {
 
     amici::Model* clone() const override { return new Model_model_calvetti(*this); };
 
-    std::string getAmiciCommit() const override { return "223c5075608273b17f304556d0e8ccb41233bd21"; };
+    std::string getAmiciCommit() const override { return "8b324bca5b796a93094195d22a023e5f8e945ef1"; };
 
     void fJSparse(SUNMatrixContent_Sparse JSparse, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype cj, const realtype *dx, const realtype *w, const realtype *dwdx) override {
         JSparse_model_calvetti(JSparse, t, x, p, k, h, cj, dx, w, dwdx);
@@ -136,11 +136,11 @@ class Model_model_calvetti : public amici::Model_DAE {
     void fdsigmazdp(double *dsigmazdp, const realtype t, const realtype *p, const realtype *k, const int ip) override {
     }
 
-    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl) override {
+    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static) override {
     }
 
-    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) override {
-        dwdx_model_calvetti(dwdx, t, x, p, k, h, w, tcl, spl);
+    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) override {
+        dwdx_model_calvetti(dwdx, t, x, p, k, h, w, tcl, spl, include_static);
     }
 
     void fdxdotdp(realtype *dxdotdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *dx, const realtype *w, const realtype *dwdp) override {
@@ -185,8 +185,8 @@ class Model_model_calvetti : public amici::Model_DAE {
     void fsz(double *sz, const int ie, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *sx, const int ip) override {
     }
 
-    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) override {
-        w_model_calvetti(w, t, x, p, k, h, tcl, spl);
+    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) override {
+        w_model_calvetti(w, t, x, p, k, h, tcl, spl, include_static);
     }
 
     void fx0(realtype *x0, const realtype t, const realtype *p, const realtype *k) override {
diff --git a/models/model_calvetti/w.cpp b/models/model_calvetti/w.cpp
index fb1aaef8e2..38773562d3 100644
--- a/models/model_calvetti/w.cpp
+++ b/models/model_calvetti/w.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_calvetti{
 
-void w_model_calvetti(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) {
+void w_model_calvetti(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) {
   w[0] = 1.0/k[0];
   w[1] = k[2]*k[2];
   w[2] = 1.0/(x[1]*x[1]);
diff --git a/models/model_dirac/CMakeLists.txt b/models/model_dirac/CMakeLists.txt
index 64f02dca9b..d96169b04a 100644
--- a/models/model_dirac/CMakeLists.txt
+++ b/models/model_dirac/CMakeLists.txt
@@ -1,5 +1,11 @@
 # Build AMICI model
 cmake_minimum_required(VERSION 3.15)
+cmake_policy(VERSION 3.15...3.27)
+
+# cmake >=3.27
+if(POLICY CMP0144)
+  cmake_policy(SET CMP0144 NEW)
+endif(POLICY CMP0144)
 
 project(model_dirac)
 
@@ -14,7 +20,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 foreach(flag ${MY_CXX_FLAGS})
   unset(CUR_FLAG_SUPPORTED CACHE)
-  check_cxx_compiler_flag(-Werror ${flag} CUR_FLAG_SUPPORTED)
+  check_cxx_compiler_flag(${flag} CUR_FLAG_SUPPORTED)
   if(${CUR_FLAG_SUPPORTED})
     string(APPEND CMAKE_CXX_FLAGS " ${flag}")
   endif()
@@ -33,6 +39,23 @@ find_package(Amici  REQUIRED HINTS
              ${CMAKE_CURRENT_LIST_DIR}/../../build)
 message(STATUS "Found AMICI ${Amici_DIR}")
 
+# Debug build?
+if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
+  add_compile_options(-UNDEBUG)
+  if(MSVC)
+    add_compile_options(-DEBUG)
+  else()
+    add_compile_options(-O0 -g)
+  endif()
+  set(CMAKE_BUILD_TYPE "Debug")
+endif()
+
+# coverage options
+if($ENV{ENABLE_GCOV_COVERAGE})
+  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
+  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
+endif()
+
 set(MODEL_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 set(SRC_LIST_LIB ${MODEL_DIR}/JSparse.cpp
@@ -73,18 +96,6 @@ if(NOT "${AMICI_PYTHON_BUILD_EXT_ONLY}")
   target_link_libraries(simulate_${PROJECT_NAME} ${PROJECT_NAME})
 endif()
 
-# Debug build?
-if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
-  add_compile_options(-UNDEBUG -O0 -g)
-  set(CMAKE_BUILD_TYPE "Debug")
-endif()
-
-# coverage options
-if($ENV{ENABLE_GCOV_COVERAGE})
-  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
-endif()
-
 # SWIG
 option(ENABLE_SWIG "Build swig/python library?" ON)
 if(ENABLE_SWIG)
diff --git a/models/model_dirac/main.cpp b/models/model_dirac/main.cpp
index 00a5e6b448..ecdff85a46 100644
--- a/models/model_dirac/main.cpp
+++ b/models/model_dirac/main.cpp
@@ -1,14 +1,13 @@
 #include <iostream>
 
-#include <amici/amici.h>    /* AMICI base functions */
-#include "wrapfunctions.h"  /* model-provided functions */
+#include "wrapfunctions.h" /* model-provided functions */
+#include <amici/amici.h>   /* AMICI base functions */
 
-template < class T >
-std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
-{
+template <class T>
+std::ostream& operator<<(std::ostream& os, std::vector<T> const& v) {
     os << "[";
-    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end(); ++ii)
-    {
+    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end();
+         ++ii) {
         os << " " << *ii;
     }
     os << "]";
@@ -21,9 +20,9 @@ std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
  */
 
 int main() {
-    std::cout<<"********************************"<<std::endl;
-    std::cout<<"** Running forward simulation **"<<std::endl;
-    std::cout<<"********************************"<<std::endl<<std::endl;
+    std::cout << "********************************" << std::endl;
+    std::cout << "** Running forward simulation **" << std::endl;
+    std::cout << "********************************" << std::endl << std::endl;
 
     // Create a model instance
     auto model = amici::generic_model::getModel();
@@ -44,21 +43,20 @@ int main() {
 
     // Print observable time course
     auto observable_ids = model->getObservableIds();
-    std::cout<<"Simulated observables for timepoints "<<rdata->ts<<"\n\n";
-    for(int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
-        std::cout<<observable_ids[i_observable]<<":\n\t";
-        for(int i_time = 0; i_time < rdata->nt; ++i_time) {
+    std::cout << "Simulated observables for timepoints " << rdata->ts << "\n\n";
+    for (int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
+        std::cout << observable_ids[i_observable] << ":\n\t";
+        for (int i_time = 0; i_time < rdata->nt; ++i_time) {
             // rdata->y is a flat 2D array in row-major ordering
-            std::cout<<rdata->y[i_time * rdata->ny + i_observable]<<" ";
+            std::cout << rdata->y[i_time * rdata->ny + i_observable] << " ";
         }
-        std::cout<<std::endl<<std::endl;
+        std::cout << std::endl << std::endl;
     }
 
-
-    std::cout<<std::endl;
-    std::cout<<"**********************************"<<std::endl;
-    std::cout<<"** Forward sensitivity analysis **"<<std::endl;
-    std::cout<<"**********************************"<<std::endl<<std::endl;
+    std::cout << std::endl;
+    std::cout << "**********************************" << std::endl;
+    std::cout << "** Forward sensitivity analysis **" << std::endl;
+    std::cout << "**********************************" << std::endl << std::endl;
 
     // Enable first-order sensitivity analysis
     solver->setSensitivityOrder(amici::SensitivityOrder::first);
@@ -78,18 +76,17 @@ int main() {
     auto state_ids = model->getStateIds();
     auto parameter_ids = model->getParameterIds();
 
-    std::cout<<"State sensitivities for timepoint "
-              <<rdata->ts[i_time]
-              <<std::endl;//nt x nplist x nx
-    for(int i_state= 0; i_state < rdata->nx; ++i_state) {
-        std::cout<<"\td("<<state_ids[i_state]<<")/d("
-                  <<parameter_ids[model->plist(i_nplist)]<<") = ";
+    std::cout << "State sensitivities for timepoint " << rdata->ts[i_time]
+              << std::endl; // nt x nplist x nx
+    for (int i_state = 0; i_state < rdata->nx; ++i_state) {
+        std::cout << "\td(" << state_ids[i_state] << ")/d("
+                  << parameter_ids[model->plist(i_nplist)] << ") = ";
 
         // rdata->sx is a flat 3D array in row-major ordering
-        std::cout<<rdata->sx[i_time * rdata->nplist * rdata->nx
-                              + i_nplist * rdata->nx
-                              + i_state];
-        std::cout<<std::endl;
+        std::cout << rdata->sx
+                         [i_time * rdata->nplist * rdata->nx
+                          + i_nplist * rdata->nx + i_state];
+        std::cout << std::endl;
     }
 
     return 0;
diff --git a/models/model_dirac/model_dirac.h b/models/model_dirac/model_dirac.h
index cfd943e456..0425320765 100644
--- a/models/model_dirac/model_dirac.h
+++ b/models/model_dirac/model_dirac.h
@@ -1,6 +1,6 @@
 #ifndef _amici_model_dirac_h
 #define _amici_model_dirac_h
-/* Generated by amiwrap (R2017b) 223c5075608273b17f304556d0e8ccb41233bd21 */
+/* Generated by amiwrap (R2017b) 8b324bca5b796a93094195d22a023e5f8e945ef1 */
 #include <cmath>
 #include <memory>
 #include "amici/defines.h"
@@ -72,7 +72,7 @@ class Model_model_dirac : public amici::Model_ODE {
 
     amici::Model* clone() const override { return new Model_model_dirac(*this); };
 
-    std::string getAmiciCommit() const override { return "223c5075608273b17f304556d0e8ccb41233bd21"; };
+    std::string getAmiciCommit() const override { return "8b324bca5b796a93094195d22a023e5f8e945ef1"; };
 
     void fJSparse(SUNMatrixContent_Sparse JSparse, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *dwdx) override {
         JSparse_model_dirac(JSparse, t, x, p, k, h, w, dwdx);
@@ -134,10 +134,10 @@ class Model_model_dirac : public amici::Model_ODE {
     void fdsigmazdp(double *dsigmazdp, const realtype t, const realtype *p, const realtype *k, const int ip) override {
     }
 
-    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl) override {
+    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static) override {
     }
 
-    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) override {
+    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) override {
     }
 
     void fdxdotdp(realtype *dxdotdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *w, const realtype *dwdp) override {
@@ -184,7 +184,7 @@ class Model_model_dirac : public amici::Model_ODE {
     void fsz(double *sz, const int ie, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *sx, const int ip) override {
     }
 
-    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) override {
+    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) override {
     }
 
     void fx0(realtype *x0, const realtype t, const realtype *p, const realtype *k) override {
diff --git a/models/model_events/CMakeLists.txt b/models/model_events/CMakeLists.txt
index 277573426d..53e3a335b8 100644
--- a/models/model_events/CMakeLists.txt
+++ b/models/model_events/CMakeLists.txt
@@ -1,5 +1,11 @@
 # Build AMICI model
 cmake_minimum_required(VERSION 3.15)
+cmake_policy(VERSION 3.15...3.27)
+
+# cmake >=3.27
+if(POLICY CMP0144)
+  cmake_policy(SET CMP0144 NEW)
+endif(POLICY CMP0144)
 
 project(model_events)
 
@@ -14,7 +20,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 foreach(flag ${MY_CXX_FLAGS})
   unset(CUR_FLAG_SUPPORTED CACHE)
-  check_cxx_compiler_flag(-Werror ${flag} CUR_FLAG_SUPPORTED)
+  check_cxx_compiler_flag(${flag} CUR_FLAG_SUPPORTED)
   if(${CUR_FLAG_SUPPORTED})
     string(APPEND CMAKE_CXX_FLAGS " ${flag}")
   endif()
@@ -33,6 +39,23 @@ find_package(Amici  REQUIRED HINTS
              ${CMAKE_CURRENT_LIST_DIR}/../../build)
 message(STATUS "Found AMICI ${Amici_DIR}")
 
+# Debug build?
+if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
+  add_compile_options(-UNDEBUG)
+  if(MSVC)
+    add_compile_options(-DEBUG)
+  else()
+    add_compile_options(-O0 -g)
+  endif()
+  set(CMAKE_BUILD_TYPE "Debug")
+endif()
+
+# coverage options
+if($ENV{ENABLE_GCOV_COVERAGE})
+  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
+  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
+endif()
+
 set(MODEL_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 set(SRC_LIST_LIB ${MODEL_DIR}/JSparse.cpp
@@ -87,18 +110,6 @@ if(NOT "${AMICI_PYTHON_BUILD_EXT_ONLY}")
   target_link_libraries(simulate_${PROJECT_NAME} ${PROJECT_NAME})
 endif()
 
-# Debug build?
-if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
-  add_compile_options(-UNDEBUG -O0 -g)
-  set(CMAKE_BUILD_TYPE "Debug")
-endif()
-
-# coverage options
-if($ENV{ENABLE_GCOV_COVERAGE})
-  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
-endif()
-
 # SWIG
 option(ENABLE_SWIG "Build swig/python library?" ON)
 if(ENABLE_SWIG)
diff --git a/models/model_events/main.cpp b/models/model_events/main.cpp
index 00a5e6b448..ecdff85a46 100644
--- a/models/model_events/main.cpp
+++ b/models/model_events/main.cpp
@@ -1,14 +1,13 @@
 #include <iostream>
 
-#include <amici/amici.h>    /* AMICI base functions */
-#include "wrapfunctions.h"  /* model-provided functions */
+#include "wrapfunctions.h" /* model-provided functions */
+#include <amici/amici.h>   /* AMICI base functions */
 
-template < class T >
-std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
-{
+template <class T>
+std::ostream& operator<<(std::ostream& os, std::vector<T> const& v) {
     os << "[";
-    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end(); ++ii)
-    {
+    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end();
+         ++ii) {
         os << " " << *ii;
     }
     os << "]";
@@ -21,9 +20,9 @@ std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
  */
 
 int main() {
-    std::cout<<"********************************"<<std::endl;
-    std::cout<<"** Running forward simulation **"<<std::endl;
-    std::cout<<"********************************"<<std::endl<<std::endl;
+    std::cout << "********************************" << std::endl;
+    std::cout << "** Running forward simulation **" << std::endl;
+    std::cout << "********************************" << std::endl << std::endl;
 
     // Create a model instance
     auto model = amici::generic_model::getModel();
@@ -44,21 +43,20 @@ int main() {
 
     // Print observable time course
     auto observable_ids = model->getObservableIds();
-    std::cout<<"Simulated observables for timepoints "<<rdata->ts<<"\n\n";
-    for(int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
-        std::cout<<observable_ids[i_observable]<<":\n\t";
-        for(int i_time = 0; i_time < rdata->nt; ++i_time) {
+    std::cout << "Simulated observables for timepoints " << rdata->ts << "\n\n";
+    for (int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
+        std::cout << observable_ids[i_observable] << ":\n\t";
+        for (int i_time = 0; i_time < rdata->nt; ++i_time) {
             // rdata->y is a flat 2D array in row-major ordering
-            std::cout<<rdata->y[i_time * rdata->ny + i_observable]<<" ";
+            std::cout << rdata->y[i_time * rdata->ny + i_observable] << " ";
         }
-        std::cout<<std::endl<<std::endl;
+        std::cout << std::endl << std::endl;
     }
 
-
-    std::cout<<std::endl;
-    std::cout<<"**********************************"<<std::endl;
-    std::cout<<"** Forward sensitivity analysis **"<<std::endl;
-    std::cout<<"**********************************"<<std::endl<<std::endl;
+    std::cout << std::endl;
+    std::cout << "**********************************" << std::endl;
+    std::cout << "** Forward sensitivity analysis **" << std::endl;
+    std::cout << "**********************************" << std::endl << std::endl;
 
     // Enable first-order sensitivity analysis
     solver->setSensitivityOrder(amici::SensitivityOrder::first);
@@ -78,18 +76,17 @@ int main() {
     auto state_ids = model->getStateIds();
     auto parameter_ids = model->getParameterIds();
 
-    std::cout<<"State sensitivities for timepoint "
-              <<rdata->ts[i_time]
-              <<std::endl;//nt x nplist x nx
-    for(int i_state= 0; i_state < rdata->nx; ++i_state) {
-        std::cout<<"\td("<<state_ids[i_state]<<")/d("
-                  <<parameter_ids[model->plist(i_nplist)]<<") = ";
+    std::cout << "State sensitivities for timepoint " << rdata->ts[i_time]
+              << std::endl; // nt x nplist x nx
+    for (int i_state = 0; i_state < rdata->nx; ++i_state) {
+        std::cout << "\td(" << state_ids[i_state] << ")/d("
+                  << parameter_ids[model->plist(i_nplist)] << ") = ";
 
         // rdata->sx is a flat 3D array in row-major ordering
-        std::cout<<rdata->sx[i_time * rdata->nplist * rdata->nx
-                              + i_nplist * rdata->nx
-                              + i_state];
-        std::cout<<std::endl;
+        std::cout << rdata->sx
+                         [i_time * rdata->nplist * rdata->nx
+                          + i_nplist * rdata->nx + i_state];
+        std::cout << std::endl;
     }
 
     return 0;
diff --git a/models/model_events/model_events.h b/models/model_events/model_events.h
index ad6c976419..bc2b1b6157 100644
--- a/models/model_events/model_events.h
+++ b/models/model_events/model_events.h
@@ -1,6 +1,6 @@
 #ifndef _amici_model_events_h
 #define _amici_model_events_h
-/* Generated by amiwrap (R2017b) 223c5075608273b17f304556d0e8ccb41233bd21 */
+/* Generated by amiwrap (R2017b) 8b324bca5b796a93094195d22a023e5f8e945ef1 */
 #include <cmath>
 #include <memory>
 #include "amici/defines.h"
@@ -86,7 +86,7 @@ class Model_model_events : public amici::Model_ODE {
 
     amici::Model* clone() const override { return new Model_model_events(*this); };
 
-    std::string getAmiciCommit() const override { return "223c5075608273b17f304556d0e8ccb41233bd21"; };
+    std::string getAmiciCommit() const override { return "8b324bca5b796a93094195d22a023e5f8e945ef1"; };
 
     void fJSparse(SUNMatrixContent_Sparse JSparse, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *dwdx) override {
         JSparse_model_events(JSparse, t, x, p, k, h, w, dwdx);
@@ -154,10 +154,10 @@ class Model_model_events : public amici::Model_ODE {
     void fdsigmazdp(double *dsigmazdp, const realtype t, const realtype *p, const realtype *k, const int ip) override {
     }
 
-    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl) override {
+    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static) override {
     }
 
-    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) override {
+    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) override {
     }
 
     void fdxdotdp(realtype *dxdotdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *w, const realtype *dwdp) override {
@@ -210,7 +210,7 @@ class Model_model_events : public amici::Model_ODE {
         sz_model_events(sz, ie, t, x, p, k, h, sx, ip);
     }
 
-    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) override {
+    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) override {
     }
 
     void fx0(realtype *x0, const realtype t, const realtype *p, const realtype *k) override {
diff --git a/models/model_jakstat_adjoint/CMakeLists.txt b/models/model_jakstat_adjoint/CMakeLists.txt
index 1670a68ee9..75cc527694 100644
--- a/models/model_jakstat_adjoint/CMakeLists.txt
+++ b/models/model_jakstat_adjoint/CMakeLists.txt
@@ -1,5 +1,11 @@
 # Build AMICI model
 cmake_minimum_required(VERSION 3.15)
+cmake_policy(VERSION 3.15...3.27)
+
+# cmake >=3.27
+if(POLICY CMP0144)
+  cmake_policy(SET CMP0144 NEW)
+endif(POLICY CMP0144)
 
 project(model_jakstat_adjoint)
 
@@ -14,7 +20,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 foreach(flag ${MY_CXX_FLAGS})
   unset(CUR_FLAG_SUPPORTED CACHE)
-  check_cxx_compiler_flag(-Werror ${flag} CUR_FLAG_SUPPORTED)
+  check_cxx_compiler_flag(${flag} CUR_FLAG_SUPPORTED)
   if(${CUR_FLAG_SUPPORTED})
     string(APPEND CMAKE_CXX_FLAGS " ${flag}")
   endif()
@@ -33,6 +39,23 @@ find_package(Amici  REQUIRED HINTS
              ${CMAKE_CURRENT_LIST_DIR}/../../build)
 message(STATUS "Found AMICI ${Amici_DIR}")
 
+# Debug build?
+if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
+  add_compile_options(-UNDEBUG)
+  if(MSVC)
+    add_compile_options(-DEBUG)
+  else()
+    add_compile_options(-O0 -g)
+  endif()
+  set(CMAKE_BUILD_TYPE "Debug")
+endif()
+
+# coverage options
+if($ENV{ENABLE_GCOV_COVERAGE})
+  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
+  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
+endif()
+
 set(MODEL_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 set(SRC_LIST_LIB ${MODEL_DIR}/JSparse.cpp
@@ -76,18 +99,6 @@ if(NOT "${AMICI_PYTHON_BUILD_EXT_ONLY}")
   target_link_libraries(simulate_${PROJECT_NAME} ${PROJECT_NAME})
 endif()
 
-# Debug build?
-if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
-  add_compile_options(-UNDEBUG -O0 -g)
-  set(CMAKE_BUILD_TYPE "Debug")
-endif()
-
-# coverage options
-if($ENV{ENABLE_GCOV_COVERAGE})
-  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
-endif()
-
 # SWIG
 option(ENABLE_SWIG "Build swig/python library?" ON)
 if(ENABLE_SWIG)
diff --git a/models/model_jakstat_adjoint/dwdp.cpp b/models/model_jakstat_adjoint/dwdp.cpp
index 3213a319d9..092466e87b 100644
--- a/models/model_jakstat_adjoint/dwdp.cpp
+++ b/models/model_jakstat_adjoint/dwdp.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_jakstat_adjoint{
 
-void dwdp_model_jakstat_adjoint(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl) {
+void dwdp_model_jakstat_adjoint(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static) {
   dwdp[0] = amici::Dspline_pos(4,t,5,0.0,p[5],5.0,p[6],1.0E1,p[7],2.0E1,p[8],6.0E1,p[9],0.0,0.0);
   dwdp[1] = amici::Dspline_pos(6,t,5,0.0,p[5],5.0,p[6],1.0E1,p[7],2.0E1,p[8],6.0E1,p[9],0.0,0.0);
   dwdp[2] = amici::Dspline_pos(8,t,5,0.0,p[5],5.0,p[6],1.0E1,p[7],2.0E1,p[8],6.0E1,p[9],0.0,0.0);
diff --git a/models/model_jakstat_adjoint/dwdx.cpp b/models/model_jakstat_adjoint/dwdx.cpp
index 70a26b8a2c..354b72f246 100644
--- a/models/model_jakstat_adjoint/dwdx.cpp
+++ b/models/model_jakstat_adjoint/dwdx.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_jakstat_adjoint{
 
-void dwdx_model_jakstat_adjoint(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) {
+void dwdx_model_jakstat_adjoint(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) {
   dwdx[0] = x[1]*2.0;
 }
 
diff --git a/models/model_jakstat_adjoint/main.cpp b/models/model_jakstat_adjoint/main.cpp
index 00a5e6b448..ecdff85a46 100644
--- a/models/model_jakstat_adjoint/main.cpp
+++ b/models/model_jakstat_adjoint/main.cpp
@@ -1,14 +1,13 @@
 #include <iostream>
 
-#include <amici/amici.h>    /* AMICI base functions */
-#include "wrapfunctions.h"  /* model-provided functions */
+#include "wrapfunctions.h" /* model-provided functions */
+#include <amici/amici.h>   /* AMICI base functions */
 
-template < class T >
-std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
-{
+template <class T>
+std::ostream& operator<<(std::ostream& os, std::vector<T> const& v) {
     os << "[";
-    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end(); ++ii)
-    {
+    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end();
+         ++ii) {
         os << " " << *ii;
     }
     os << "]";
@@ -21,9 +20,9 @@ std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
  */
 
 int main() {
-    std::cout<<"********************************"<<std::endl;
-    std::cout<<"** Running forward simulation **"<<std::endl;
-    std::cout<<"********************************"<<std::endl<<std::endl;
+    std::cout << "********************************" << std::endl;
+    std::cout << "** Running forward simulation **" << std::endl;
+    std::cout << "********************************" << std::endl << std::endl;
 
     // Create a model instance
     auto model = amici::generic_model::getModel();
@@ -44,21 +43,20 @@ int main() {
 
     // Print observable time course
     auto observable_ids = model->getObservableIds();
-    std::cout<<"Simulated observables for timepoints "<<rdata->ts<<"\n\n";
-    for(int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
-        std::cout<<observable_ids[i_observable]<<":\n\t";
-        for(int i_time = 0; i_time < rdata->nt; ++i_time) {
+    std::cout << "Simulated observables for timepoints " << rdata->ts << "\n\n";
+    for (int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
+        std::cout << observable_ids[i_observable] << ":\n\t";
+        for (int i_time = 0; i_time < rdata->nt; ++i_time) {
             // rdata->y is a flat 2D array in row-major ordering
-            std::cout<<rdata->y[i_time * rdata->ny + i_observable]<<" ";
+            std::cout << rdata->y[i_time * rdata->ny + i_observable] << " ";
         }
-        std::cout<<std::endl<<std::endl;
+        std::cout << std::endl << std::endl;
     }
 
-
-    std::cout<<std::endl;
-    std::cout<<"**********************************"<<std::endl;
-    std::cout<<"** Forward sensitivity analysis **"<<std::endl;
-    std::cout<<"**********************************"<<std::endl<<std::endl;
+    std::cout << std::endl;
+    std::cout << "**********************************" << std::endl;
+    std::cout << "** Forward sensitivity analysis **" << std::endl;
+    std::cout << "**********************************" << std::endl << std::endl;
 
     // Enable first-order sensitivity analysis
     solver->setSensitivityOrder(amici::SensitivityOrder::first);
@@ -78,18 +76,17 @@ int main() {
     auto state_ids = model->getStateIds();
     auto parameter_ids = model->getParameterIds();
 
-    std::cout<<"State sensitivities for timepoint "
-              <<rdata->ts[i_time]
-              <<std::endl;//nt x nplist x nx
-    for(int i_state= 0; i_state < rdata->nx; ++i_state) {
-        std::cout<<"\td("<<state_ids[i_state]<<")/d("
-                  <<parameter_ids[model->plist(i_nplist)]<<") = ";
+    std::cout << "State sensitivities for timepoint " << rdata->ts[i_time]
+              << std::endl; // nt x nplist x nx
+    for (int i_state = 0; i_state < rdata->nx; ++i_state) {
+        std::cout << "\td(" << state_ids[i_state] << ")/d("
+                  << parameter_ids[model->plist(i_nplist)] << ") = ";
 
         // rdata->sx is a flat 3D array in row-major ordering
-        std::cout<<rdata->sx[i_time * rdata->nplist * rdata->nx
-                              + i_nplist * rdata->nx
-                              + i_state];
-        std::cout<<std::endl;
+        std::cout << rdata->sx
+                         [i_time * rdata->nplist * rdata->nx
+                          + i_nplist * rdata->nx + i_state];
+        std::cout << std::endl;
     }
 
     return 0;
diff --git a/models/model_jakstat_adjoint/model_jakstat_adjoint.h b/models/model_jakstat_adjoint/model_jakstat_adjoint.h
index 6d7601947a..aad482c26c 100644
--- a/models/model_jakstat_adjoint/model_jakstat_adjoint.h
+++ b/models/model_jakstat_adjoint/model_jakstat_adjoint.h
@@ -1,6 +1,6 @@
 #ifndef _amici_model_jakstat_adjoint_h
 #define _amici_model_jakstat_adjoint_h
-/* Generated by amiwrap (R2017b) 223c5075608273b17f304556d0e8ccb41233bd21 */
+/* Generated by amiwrap (R2017b) 8b324bca5b796a93094195d22a023e5f8e945ef1 */
 #include <cmath>
 #include <memory>
 #include "amici/defines.h"
@@ -19,14 +19,14 @@ extern void Jy_model_jakstat_adjoint(double *nllh, const int iy, const realtype
 extern void dJydsigma_model_jakstat_adjoint(double *dJydsigma, const int iy, const realtype *p, const realtype *k, const double *y, const double *sigmay, const double *my);
 extern void dJydy_model_jakstat_adjoint(double *dJydy, const int iy, const realtype *p, const realtype *k, const double *y, const double *sigmay, const double *my);
 extern void dsigmaydp_model_jakstat_adjoint(double *dsigmaydp, const realtype t, const realtype *p, const realtype *k, const realtype *y, const int ip);
-extern void dwdp_model_jakstat_adjoint(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl);
-extern void dwdx_model_jakstat_adjoint(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl);
+extern void dwdp_model_jakstat_adjoint(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static);
+extern void dwdx_model_jakstat_adjoint(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static);
 extern void dxdotdp_model_jakstat_adjoint(realtype *dxdotdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *w, const realtype *dwdp);
 extern void dydp_model_jakstat_adjoint(double *dydp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *w, const realtype *dwdp);
 extern void dydx_model_jakstat_adjoint(double *dydx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *dwdx);
 extern void sigmay_model_jakstat_adjoint(double *sigmay, const realtype t, const realtype *p, const realtype *k, const realtype *y);
 extern void sx0_model_jakstat_adjoint(realtype *sx0, const realtype t,const realtype *x0, const realtype *p, const realtype *k, const int ip);
-extern void w_model_jakstat_adjoint(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl);
+extern void w_model_jakstat_adjoint(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static);
 extern void x0_model_jakstat_adjoint(realtype *x0, const realtype t, const realtype *p, const realtype *k);
 extern void xdot_model_jakstat_adjoint(realtype *xdot, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w);
 extern void y_model_jakstat_adjoint(double *y, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w);
@@ -75,7 +75,7 @@ class Model_model_jakstat_adjoint : public amici::Model_ODE {
 
     amici::Model* clone() const override { return new Model_model_jakstat_adjoint(*this); };
 
-    std::string getAmiciCommit() const override { return "223c5075608273b17f304556d0e8ccb41233bd21"; };
+    std::string getAmiciCommit() const override { return "8b324bca5b796a93094195d22a023e5f8e945ef1"; };
 
     void fJSparse(SUNMatrixContent_Sparse JSparse, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *dwdx) override {
         JSparse_model_jakstat_adjoint(JSparse, t, x, p, k, h, w, dwdx);
@@ -136,12 +136,12 @@ class Model_model_jakstat_adjoint : public amici::Model_ODE {
     void fdsigmazdp(double *dsigmazdp, const realtype t, const realtype *p, const realtype *k, const int ip) override {
     }
 
-    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl) override {
-        dwdp_model_jakstat_adjoint(dwdp, t, x, p, k, h, w, tcl, stcl, spl, sspl);
+    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static) override {
+        dwdp_model_jakstat_adjoint(dwdp, t, x, p, k, h, w, tcl, stcl, spl, sspl, include_static);
     }
 
-    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) override {
-        dwdx_model_jakstat_adjoint(dwdx, t, x, p, k, h, w, tcl, spl);
+    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) override {
+        dwdx_model_jakstat_adjoint(dwdx, t, x, p, k, h, w, tcl, spl, include_static);
     }
 
     void fdxdotdp(realtype *dxdotdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *w, const realtype *dwdp) override {
@@ -188,8 +188,8 @@ class Model_model_jakstat_adjoint : public amici::Model_ODE {
     void fsz(double *sz, const int ie, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *sx, const int ip) override {
     }
 
-    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) override {
-        w_model_jakstat_adjoint(w, t, x, p, k, h, tcl, spl);
+    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) override {
+        w_model_jakstat_adjoint(w, t, x, p, k, h, tcl, spl, include_static);
     }
 
     void fx0(realtype *x0, const realtype t, const realtype *p, const realtype *k) override {
diff --git a/models/model_jakstat_adjoint/w.cpp b/models/model_jakstat_adjoint/w.cpp
index 06238238ca..430b96de3a 100644
--- a/models/model_jakstat_adjoint/w.cpp
+++ b/models/model_jakstat_adjoint/w.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_jakstat_adjoint{
 
-void w_model_jakstat_adjoint(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) {
+void w_model_jakstat_adjoint(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) {
   w[0] = amici::spline_pos(t,5,0.0,p[5],5.0,p[6],1.0E1,p[7],2.0E1,p[8],6.0E1,p[9],0.0,0.0);
   w[1] = x[1]*x[1];
 }
diff --git a/models/model_jakstat_adjoint_o2/CMakeLists.txt b/models/model_jakstat_adjoint_o2/CMakeLists.txt
index b4b9cc03ca..4b2b35e223 100644
--- a/models/model_jakstat_adjoint_o2/CMakeLists.txt
+++ b/models/model_jakstat_adjoint_o2/CMakeLists.txt
@@ -1,5 +1,11 @@
 # Build AMICI model
 cmake_minimum_required(VERSION 3.15)
+cmake_policy(VERSION 3.15...3.27)
+
+# cmake >=3.27
+if(POLICY CMP0144)
+  cmake_policy(SET CMP0144 NEW)
+endif(POLICY CMP0144)
 
 project(model_jakstat_adjoint_o2)
 
@@ -14,7 +20,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 foreach(flag ${MY_CXX_FLAGS})
   unset(CUR_FLAG_SUPPORTED CACHE)
-  check_cxx_compiler_flag(-Werror ${flag} CUR_FLAG_SUPPORTED)
+  check_cxx_compiler_flag(${flag} CUR_FLAG_SUPPORTED)
   if(${CUR_FLAG_SUPPORTED})
     string(APPEND CMAKE_CXX_FLAGS " ${flag}")
   endif()
@@ -33,6 +39,23 @@ find_package(Amici  REQUIRED HINTS
              ${CMAKE_CURRENT_LIST_DIR}/../../build)
 message(STATUS "Found AMICI ${Amici_DIR}")
 
+# Debug build?
+if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
+  add_compile_options(-UNDEBUG)
+  if(MSVC)
+    add_compile_options(-DEBUG)
+  else()
+    add_compile_options(-O0 -g)
+  endif()
+  set(CMAKE_BUILD_TYPE "Debug")
+endif()
+
+# coverage options
+if($ENV{ENABLE_GCOV_COVERAGE})
+  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
+  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
+endif()
+
 set(MODEL_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 set(SRC_LIST_LIB ${MODEL_DIR}/JSparse.cpp
@@ -76,18 +99,6 @@ if(NOT "${AMICI_PYTHON_BUILD_EXT_ONLY}")
   target_link_libraries(simulate_${PROJECT_NAME} ${PROJECT_NAME})
 endif()
 
-# Debug build?
-if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
-  add_compile_options(-UNDEBUG -O0 -g)
-  set(CMAKE_BUILD_TYPE "Debug")
-endif()
-
-# coverage options
-if($ENV{ENABLE_GCOV_COVERAGE})
-  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
-endif()
-
 # SWIG
 option(ENABLE_SWIG "Build swig/python library?" ON)
 if(ENABLE_SWIG)
diff --git a/models/model_jakstat_adjoint_o2/dwdp.cpp b/models/model_jakstat_adjoint_o2/dwdp.cpp
index b3e591fcba..a936666e39 100644
--- a/models/model_jakstat_adjoint_o2/dwdp.cpp
+++ b/models/model_jakstat_adjoint_o2/dwdp.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_jakstat_adjoint_o2{
 
-void dwdp_model_jakstat_adjoint_o2(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl) {
+void dwdp_model_jakstat_adjoint_o2(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static) {
   dwdp[0] = amici::Dspline_pos(4,t,5,0.0,p[5],5.0,p[6],1.0E1,p[7],2.0E1,p[8],6.0E1,p[9],0.0,0.0);
   dwdp[1] = amici::DDspline_pos(4,4,t,5,0.0,p[5],5.0,p[6],1.0E1,p[7],2.0E1,p[8],6.0E1,p[9],0.0,0.0);
   dwdp[2] = amici::DDspline_pos(6,4,t,5,0.0,p[5],5.0,p[6],1.0E1,p[7],2.0E1,p[8],6.0E1,p[9],0.0,0.0);
diff --git a/models/model_jakstat_adjoint_o2/dwdx.cpp b/models/model_jakstat_adjoint_o2/dwdx.cpp
index 3226a7535b..81ad6343f1 100644
--- a/models/model_jakstat_adjoint_o2/dwdx.cpp
+++ b/models/model_jakstat_adjoint_o2/dwdx.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_jakstat_adjoint_o2{
 
-void dwdx_model_jakstat_adjoint_o2(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) {
+void dwdx_model_jakstat_adjoint_o2(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) {
   dwdx[0] = x[1]*2.0;
   dwdx[1] = 2.0;
 }
diff --git a/models/model_jakstat_adjoint_o2/main.cpp b/models/model_jakstat_adjoint_o2/main.cpp
index 00a5e6b448..ecdff85a46 100644
--- a/models/model_jakstat_adjoint_o2/main.cpp
+++ b/models/model_jakstat_adjoint_o2/main.cpp
@@ -1,14 +1,13 @@
 #include <iostream>
 
-#include <amici/amici.h>    /* AMICI base functions */
-#include "wrapfunctions.h"  /* model-provided functions */
+#include "wrapfunctions.h" /* model-provided functions */
+#include <amici/amici.h>   /* AMICI base functions */
 
-template < class T >
-std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
-{
+template <class T>
+std::ostream& operator<<(std::ostream& os, std::vector<T> const& v) {
     os << "[";
-    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end(); ++ii)
-    {
+    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end();
+         ++ii) {
         os << " " << *ii;
     }
     os << "]";
@@ -21,9 +20,9 @@ std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
  */
 
 int main() {
-    std::cout<<"********************************"<<std::endl;
-    std::cout<<"** Running forward simulation **"<<std::endl;
-    std::cout<<"********************************"<<std::endl<<std::endl;
+    std::cout << "********************************" << std::endl;
+    std::cout << "** Running forward simulation **" << std::endl;
+    std::cout << "********************************" << std::endl << std::endl;
 
     // Create a model instance
     auto model = amici::generic_model::getModel();
@@ -44,21 +43,20 @@ int main() {
 
     // Print observable time course
     auto observable_ids = model->getObservableIds();
-    std::cout<<"Simulated observables for timepoints "<<rdata->ts<<"\n\n";
-    for(int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
-        std::cout<<observable_ids[i_observable]<<":\n\t";
-        for(int i_time = 0; i_time < rdata->nt; ++i_time) {
+    std::cout << "Simulated observables for timepoints " << rdata->ts << "\n\n";
+    for (int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
+        std::cout << observable_ids[i_observable] << ":\n\t";
+        for (int i_time = 0; i_time < rdata->nt; ++i_time) {
             // rdata->y is a flat 2D array in row-major ordering
-            std::cout<<rdata->y[i_time * rdata->ny + i_observable]<<" ";
+            std::cout << rdata->y[i_time * rdata->ny + i_observable] << " ";
         }
-        std::cout<<std::endl<<std::endl;
+        std::cout << std::endl << std::endl;
     }
 
-
-    std::cout<<std::endl;
-    std::cout<<"**********************************"<<std::endl;
-    std::cout<<"** Forward sensitivity analysis **"<<std::endl;
-    std::cout<<"**********************************"<<std::endl<<std::endl;
+    std::cout << std::endl;
+    std::cout << "**********************************" << std::endl;
+    std::cout << "** Forward sensitivity analysis **" << std::endl;
+    std::cout << "**********************************" << std::endl << std::endl;
 
     // Enable first-order sensitivity analysis
     solver->setSensitivityOrder(amici::SensitivityOrder::first);
@@ -78,18 +76,17 @@ int main() {
     auto state_ids = model->getStateIds();
     auto parameter_ids = model->getParameterIds();
 
-    std::cout<<"State sensitivities for timepoint "
-              <<rdata->ts[i_time]
-              <<std::endl;//nt x nplist x nx
-    for(int i_state= 0; i_state < rdata->nx; ++i_state) {
-        std::cout<<"\td("<<state_ids[i_state]<<")/d("
-                  <<parameter_ids[model->plist(i_nplist)]<<") = ";
+    std::cout << "State sensitivities for timepoint " << rdata->ts[i_time]
+              << std::endl; // nt x nplist x nx
+    for (int i_state = 0; i_state < rdata->nx; ++i_state) {
+        std::cout << "\td(" << state_ids[i_state] << ")/d("
+                  << parameter_ids[model->plist(i_nplist)] << ") = ";
 
         // rdata->sx is a flat 3D array in row-major ordering
-        std::cout<<rdata->sx[i_time * rdata->nplist * rdata->nx
-                              + i_nplist * rdata->nx
-                              + i_state];
-        std::cout<<std::endl;
+        std::cout << rdata->sx
+                         [i_time * rdata->nplist * rdata->nx
+                          + i_nplist * rdata->nx + i_state];
+        std::cout << std::endl;
     }
 
     return 0;
diff --git a/models/model_jakstat_adjoint_o2/model_jakstat_adjoint_o2.h b/models/model_jakstat_adjoint_o2/model_jakstat_adjoint_o2.h
index bfac0b3267..e44c31b8d5 100644
--- a/models/model_jakstat_adjoint_o2/model_jakstat_adjoint_o2.h
+++ b/models/model_jakstat_adjoint_o2/model_jakstat_adjoint_o2.h
@@ -1,6 +1,6 @@
 #ifndef _amici_model_jakstat_adjoint_o2_h
 #define _amici_model_jakstat_adjoint_o2_h
-/* Generated by amiwrap (R2017b) 223c5075608273b17f304556d0e8ccb41233bd21 */
+/* Generated by amiwrap (R2017b) 8b324bca5b796a93094195d22a023e5f8e945ef1 */
 #include <cmath>
 #include <memory>
 #include "amici/defines.h"
@@ -19,14 +19,14 @@ extern void Jy_model_jakstat_adjoint_o2(double *nllh, const int iy, const realty
 extern void dJydsigma_model_jakstat_adjoint_o2(double *dJydsigma, const int iy, const realtype *p, const realtype *k, const double *y, const double *sigmay, const double *my);
 extern void dJydy_model_jakstat_adjoint_o2(double *dJydy, const int iy, const realtype *p, const realtype *k, const double *y, const double *sigmay, const double *my);
 extern void dsigmaydp_model_jakstat_adjoint_o2(double *dsigmaydp, const realtype t, const realtype *p, const realtype *k, const realtype *y, const int ip);
-extern void dwdp_model_jakstat_adjoint_o2(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl);
-extern void dwdx_model_jakstat_adjoint_o2(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl);
+extern void dwdp_model_jakstat_adjoint_o2(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static);
+extern void dwdx_model_jakstat_adjoint_o2(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static);
 extern void dxdotdp_model_jakstat_adjoint_o2(realtype *dxdotdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *w, const realtype *dwdp);
 extern void dydp_model_jakstat_adjoint_o2(double *dydp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *w, const realtype *dwdp);
 extern void dydx_model_jakstat_adjoint_o2(double *dydx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *dwdx);
 extern void sigmay_model_jakstat_adjoint_o2(double *sigmay, const realtype t, const realtype *p, const realtype *k, const realtype *y);
 extern void sx0_model_jakstat_adjoint_o2(realtype *sx0, const realtype t,const realtype *x0, const realtype *p, const realtype *k, const int ip);
-extern void w_model_jakstat_adjoint_o2(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl);
+extern void w_model_jakstat_adjoint_o2(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static);
 extern void x0_model_jakstat_adjoint_o2(realtype *x0, const realtype t, const realtype *p, const realtype *k);
 extern void xdot_model_jakstat_adjoint_o2(realtype *xdot, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w);
 extern void y_model_jakstat_adjoint_o2(double *y, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w);
@@ -75,7 +75,7 @@ class Model_model_jakstat_adjoint_o2 : public amici::Model_ODE {
 
     amici::Model* clone() const override { return new Model_model_jakstat_adjoint_o2(*this); };
 
-    std::string getAmiciCommit() const override { return "223c5075608273b17f304556d0e8ccb41233bd21"; };
+    std::string getAmiciCommit() const override { return "8b324bca5b796a93094195d22a023e5f8e945ef1"; };
 
     void fJSparse(SUNMatrixContent_Sparse JSparse, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *dwdx) override {
         JSparse_model_jakstat_adjoint_o2(JSparse, t, x, p, k, h, w, dwdx);
@@ -136,12 +136,12 @@ class Model_model_jakstat_adjoint_o2 : public amici::Model_ODE {
     void fdsigmazdp(double *dsigmazdp, const realtype t, const realtype *p, const realtype *k, const int ip) override {
     }
 
-    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl) override {
-        dwdp_model_jakstat_adjoint_o2(dwdp, t, x, p, k, h, w, tcl, stcl, spl, sspl);
+    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static) override {
+        dwdp_model_jakstat_adjoint_o2(dwdp, t, x, p, k, h, w, tcl, stcl, spl, sspl, include_static);
     }
 
-    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) override {
-        dwdx_model_jakstat_adjoint_o2(dwdx, t, x, p, k, h, w, tcl, spl);
+    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) override {
+        dwdx_model_jakstat_adjoint_o2(dwdx, t, x, p, k, h, w, tcl, spl, include_static);
     }
 
     void fdxdotdp(realtype *dxdotdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *w, const realtype *dwdp) override {
@@ -188,8 +188,8 @@ class Model_model_jakstat_adjoint_o2 : public amici::Model_ODE {
     void fsz(double *sz, const int ie, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *sx, const int ip) override {
     }
 
-    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) override {
-        w_model_jakstat_adjoint_o2(w, t, x, p, k, h, tcl, spl);
+    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) override {
+        w_model_jakstat_adjoint_o2(w, t, x, p, k, h, tcl, spl, include_static);
     }
 
     void fx0(realtype *x0, const realtype t, const realtype *p, const realtype *k) override {
diff --git a/models/model_jakstat_adjoint_o2/w.cpp b/models/model_jakstat_adjoint_o2/w.cpp
index 766860cfa0..827202e139 100644
--- a/models/model_jakstat_adjoint_o2/w.cpp
+++ b/models/model_jakstat_adjoint_o2/w.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_jakstat_adjoint_o2{
 
-void w_model_jakstat_adjoint_o2(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) {
+void w_model_jakstat_adjoint_o2(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) {
   w[0] = amici::spline_pos(t,5,0.0,p[5],5.0,p[6],1.0E1,p[7],2.0E1,p[8],6.0E1,p[9],0.0,0.0);
   w[1] = x[1]*x[1];
   w[2] = 1.0/k[0];
diff --git a/models/model_nested_events/CMakeLists.txt b/models/model_nested_events/CMakeLists.txt
index 1a67d0a2c2..c609531e1d 100644
--- a/models/model_nested_events/CMakeLists.txt
+++ b/models/model_nested_events/CMakeLists.txt
@@ -1,5 +1,11 @@
 # Build AMICI model
 cmake_minimum_required(VERSION 3.15)
+cmake_policy(VERSION 3.15...3.27)
+
+# cmake >=3.27
+if(POLICY CMP0144)
+  cmake_policy(SET CMP0144 NEW)
+endif(POLICY CMP0144)
 
 project(model_nested_events)
 
@@ -14,7 +20,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 foreach(flag ${MY_CXX_FLAGS})
   unset(CUR_FLAG_SUPPORTED CACHE)
-  check_cxx_compiler_flag(-Werror ${flag} CUR_FLAG_SUPPORTED)
+  check_cxx_compiler_flag(${flag} CUR_FLAG_SUPPORTED)
   if(${CUR_FLAG_SUPPORTED})
     string(APPEND CMAKE_CXX_FLAGS " ${flag}")
   endif()
@@ -33,6 +39,23 @@ find_package(Amici  REQUIRED HINTS
              ${CMAKE_CURRENT_LIST_DIR}/../../build)
 message(STATUS "Found AMICI ${Amici_DIR}")
 
+# Debug build?
+if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
+  add_compile_options(-UNDEBUG)
+  if(MSVC)
+    add_compile_options(-DEBUG)
+  else()
+    add_compile_options(-O0 -g)
+  endif()
+  set(CMAKE_BUILD_TYPE "Debug")
+endif()
+
+# coverage options
+if($ENV{ENABLE_GCOV_COVERAGE})
+  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
+  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
+endif()
+
 set(MODEL_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 set(SRC_LIST_LIB ${MODEL_DIR}/JSparse.cpp
@@ -76,18 +99,6 @@ if(NOT "${AMICI_PYTHON_BUILD_EXT_ONLY}")
   target_link_libraries(simulate_${PROJECT_NAME} ${PROJECT_NAME})
 endif()
 
-# Debug build?
-if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
-  add_compile_options(-UNDEBUG -O0 -g)
-  set(CMAKE_BUILD_TYPE "Debug")
-endif()
-
-# coverage options
-if($ENV{ENABLE_GCOV_COVERAGE})
-  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
-endif()
-
 # SWIG
 option(ENABLE_SWIG "Build swig/python library?" ON)
 if(ENABLE_SWIG)
diff --git a/models/model_nested_events/main.cpp b/models/model_nested_events/main.cpp
index 00a5e6b448..ecdff85a46 100644
--- a/models/model_nested_events/main.cpp
+++ b/models/model_nested_events/main.cpp
@@ -1,14 +1,13 @@
 #include <iostream>
 
-#include <amici/amici.h>    /* AMICI base functions */
-#include "wrapfunctions.h"  /* model-provided functions */
+#include "wrapfunctions.h" /* model-provided functions */
+#include <amici/amici.h>   /* AMICI base functions */
 
-template < class T >
-std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
-{
+template <class T>
+std::ostream& operator<<(std::ostream& os, std::vector<T> const& v) {
     os << "[";
-    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end(); ++ii)
-    {
+    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end();
+         ++ii) {
         os << " " << *ii;
     }
     os << "]";
@@ -21,9 +20,9 @@ std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
  */
 
 int main() {
-    std::cout<<"********************************"<<std::endl;
-    std::cout<<"** Running forward simulation **"<<std::endl;
-    std::cout<<"********************************"<<std::endl<<std::endl;
+    std::cout << "********************************" << std::endl;
+    std::cout << "** Running forward simulation **" << std::endl;
+    std::cout << "********************************" << std::endl << std::endl;
 
     // Create a model instance
     auto model = amici::generic_model::getModel();
@@ -44,21 +43,20 @@ int main() {
 
     // Print observable time course
     auto observable_ids = model->getObservableIds();
-    std::cout<<"Simulated observables for timepoints "<<rdata->ts<<"\n\n";
-    for(int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
-        std::cout<<observable_ids[i_observable]<<":\n\t";
-        for(int i_time = 0; i_time < rdata->nt; ++i_time) {
+    std::cout << "Simulated observables for timepoints " << rdata->ts << "\n\n";
+    for (int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
+        std::cout << observable_ids[i_observable] << ":\n\t";
+        for (int i_time = 0; i_time < rdata->nt; ++i_time) {
             // rdata->y is a flat 2D array in row-major ordering
-            std::cout<<rdata->y[i_time * rdata->ny + i_observable]<<" ";
+            std::cout << rdata->y[i_time * rdata->ny + i_observable] << " ";
         }
-        std::cout<<std::endl<<std::endl;
+        std::cout << std::endl << std::endl;
     }
 
-
-    std::cout<<std::endl;
-    std::cout<<"**********************************"<<std::endl;
-    std::cout<<"** Forward sensitivity analysis **"<<std::endl;
-    std::cout<<"**********************************"<<std::endl<<std::endl;
+    std::cout << std::endl;
+    std::cout << "**********************************" << std::endl;
+    std::cout << "** Forward sensitivity analysis **" << std::endl;
+    std::cout << "**********************************" << std::endl << std::endl;
 
     // Enable first-order sensitivity analysis
     solver->setSensitivityOrder(amici::SensitivityOrder::first);
@@ -78,18 +76,17 @@ int main() {
     auto state_ids = model->getStateIds();
     auto parameter_ids = model->getParameterIds();
 
-    std::cout<<"State sensitivities for timepoint "
-              <<rdata->ts[i_time]
-              <<std::endl;//nt x nplist x nx
-    for(int i_state= 0; i_state < rdata->nx; ++i_state) {
-        std::cout<<"\td("<<state_ids[i_state]<<")/d("
-                  <<parameter_ids[model->plist(i_nplist)]<<") = ";
+    std::cout << "State sensitivities for timepoint " << rdata->ts[i_time]
+              << std::endl; // nt x nplist x nx
+    for (int i_state = 0; i_state < rdata->nx; ++i_state) {
+        std::cout << "\td(" << state_ids[i_state] << ")/d("
+                  << parameter_ids[model->plist(i_nplist)] << ") = ";
 
         // rdata->sx is a flat 3D array in row-major ordering
-        std::cout<<rdata->sx[i_time * rdata->nplist * rdata->nx
-                              + i_nplist * rdata->nx
-                              + i_state];
-        std::cout<<std::endl;
+        std::cout << rdata->sx
+                         [i_time * rdata->nplist * rdata->nx
+                          + i_nplist * rdata->nx + i_state];
+        std::cout << std::endl;
     }
 
     return 0;
diff --git a/models/model_nested_events/model_nested_events.h b/models/model_nested_events/model_nested_events.h
index 0ed43eedbd..5cad2049a9 100644
--- a/models/model_nested_events/model_nested_events.h
+++ b/models/model_nested_events/model_nested_events.h
@@ -1,6 +1,6 @@
 #ifndef _amici_model_nested_events_h
 #define _amici_model_nested_events_h
-/* Generated by amiwrap (R2017b) 223c5075608273b17f304556d0e8ccb41233bd21 */
+/* Generated by amiwrap (R2017b) 8b324bca5b796a93094195d22a023e5f8e945ef1 */
 #include <cmath>
 #include <memory>
 #include "amici/defines.h"
@@ -75,7 +75,7 @@ class Model_model_nested_events : public amici::Model_ODE {
 
     amici::Model* clone() const override { return new Model_model_nested_events(*this); };
 
-    std::string getAmiciCommit() const override { return "223c5075608273b17f304556d0e8ccb41233bd21"; };
+    std::string getAmiciCommit() const override { return "8b324bca5b796a93094195d22a023e5f8e945ef1"; };
 
     void fJSparse(SUNMatrixContent_Sparse JSparse, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *dwdx) override {
         JSparse_model_nested_events(JSparse, t, x, p, k, h, w, dwdx);
@@ -138,10 +138,10 @@ class Model_model_nested_events : public amici::Model_ODE {
     void fdsigmazdp(double *dsigmazdp, const realtype t, const realtype *p, const realtype *k, const int ip) override {
     }
 
-    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl) override {
+    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static) override {
     }
 
-    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) override {
+    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) override {
     }
 
     void fdxdotdp(realtype *dxdotdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *w, const realtype *dwdp) override {
@@ -189,7 +189,7 @@ class Model_model_nested_events : public amici::Model_ODE {
     void fsz(double *sz, const int ie, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *sx, const int ip) override {
     }
 
-    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) override {
+    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) override {
     }
 
     void fx0(realtype *x0, const realtype t, const realtype *p, const realtype *k) override {
diff --git a/models/model_neuron/CMakeLists.txt b/models/model_neuron/CMakeLists.txt
index 3234271696..4b580c036a 100644
--- a/models/model_neuron/CMakeLists.txt
+++ b/models/model_neuron/CMakeLists.txt
@@ -1,5 +1,11 @@
 # Build AMICI model
 cmake_minimum_required(VERSION 3.15)
+cmake_policy(VERSION 3.15...3.27)
+
+# cmake >=3.27
+if(POLICY CMP0144)
+  cmake_policy(SET CMP0144 NEW)
+endif(POLICY CMP0144)
 
 project(model_neuron)
 
@@ -14,7 +20,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 foreach(flag ${MY_CXX_FLAGS})
   unset(CUR_FLAG_SUPPORTED CACHE)
-  check_cxx_compiler_flag(-Werror ${flag} CUR_FLAG_SUPPORTED)
+  check_cxx_compiler_flag(${flag} CUR_FLAG_SUPPORTED)
   if(${CUR_FLAG_SUPPORTED})
     string(APPEND CMAKE_CXX_FLAGS " ${flag}")
   endif()
@@ -33,6 +39,23 @@ find_package(Amici  REQUIRED HINTS
              ${CMAKE_CURRENT_LIST_DIR}/../../build)
 message(STATUS "Found AMICI ${Amici_DIR}")
 
+# Debug build?
+if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
+  add_compile_options(-UNDEBUG)
+  if(MSVC)
+    add_compile_options(-DEBUG)
+  else()
+    add_compile_options(-O0 -g)
+  endif()
+  set(CMAKE_BUILD_TYPE "Debug")
+endif()
+
+# coverage options
+if($ENV{ENABLE_GCOV_COVERAGE})
+  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
+  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
+endif()
+
 set(MODEL_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 set(SRC_LIST_LIB ${MODEL_DIR}/JSparse.cpp
@@ -90,18 +113,6 @@ if(NOT "${AMICI_PYTHON_BUILD_EXT_ONLY}")
   target_link_libraries(simulate_${PROJECT_NAME} ${PROJECT_NAME})
 endif()
 
-# Debug build?
-if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
-  add_compile_options(-UNDEBUG -O0 -g)
-  set(CMAKE_BUILD_TYPE "Debug")
-endif()
-
-# coverage options
-if($ENV{ENABLE_GCOV_COVERAGE})
-  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
-endif()
-
 # SWIG
 option(ENABLE_SWIG "Build swig/python library?" ON)
 if(ENABLE_SWIG)
diff --git a/models/model_neuron/main.cpp b/models/model_neuron/main.cpp
index 00a5e6b448..ecdff85a46 100644
--- a/models/model_neuron/main.cpp
+++ b/models/model_neuron/main.cpp
@@ -1,14 +1,13 @@
 #include <iostream>
 
-#include <amici/amici.h>    /* AMICI base functions */
-#include "wrapfunctions.h"  /* model-provided functions */
+#include "wrapfunctions.h" /* model-provided functions */
+#include <amici/amici.h>   /* AMICI base functions */
 
-template < class T >
-std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
-{
+template <class T>
+std::ostream& operator<<(std::ostream& os, std::vector<T> const& v) {
     os << "[";
-    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end(); ++ii)
-    {
+    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end();
+         ++ii) {
         os << " " << *ii;
     }
     os << "]";
@@ -21,9 +20,9 @@ std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
  */
 
 int main() {
-    std::cout<<"********************************"<<std::endl;
-    std::cout<<"** Running forward simulation **"<<std::endl;
-    std::cout<<"********************************"<<std::endl<<std::endl;
+    std::cout << "********************************" << std::endl;
+    std::cout << "** Running forward simulation **" << std::endl;
+    std::cout << "********************************" << std::endl << std::endl;
 
     // Create a model instance
     auto model = amici::generic_model::getModel();
@@ -44,21 +43,20 @@ int main() {
 
     // Print observable time course
     auto observable_ids = model->getObservableIds();
-    std::cout<<"Simulated observables for timepoints "<<rdata->ts<<"\n\n";
-    for(int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
-        std::cout<<observable_ids[i_observable]<<":\n\t";
-        for(int i_time = 0; i_time < rdata->nt; ++i_time) {
+    std::cout << "Simulated observables for timepoints " << rdata->ts << "\n\n";
+    for (int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
+        std::cout << observable_ids[i_observable] << ":\n\t";
+        for (int i_time = 0; i_time < rdata->nt; ++i_time) {
             // rdata->y is a flat 2D array in row-major ordering
-            std::cout<<rdata->y[i_time * rdata->ny + i_observable]<<" ";
+            std::cout << rdata->y[i_time * rdata->ny + i_observable] << " ";
         }
-        std::cout<<std::endl<<std::endl;
+        std::cout << std::endl << std::endl;
     }
 
-
-    std::cout<<std::endl;
-    std::cout<<"**********************************"<<std::endl;
-    std::cout<<"** Forward sensitivity analysis **"<<std::endl;
-    std::cout<<"**********************************"<<std::endl<<std::endl;
+    std::cout << std::endl;
+    std::cout << "**********************************" << std::endl;
+    std::cout << "** Forward sensitivity analysis **" << std::endl;
+    std::cout << "**********************************" << std::endl << std::endl;
 
     // Enable first-order sensitivity analysis
     solver->setSensitivityOrder(amici::SensitivityOrder::first);
@@ -78,18 +76,17 @@ int main() {
     auto state_ids = model->getStateIds();
     auto parameter_ids = model->getParameterIds();
 
-    std::cout<<"State sensitivities for timepoint "
-              <<rdata->ts[i_time]
-              <<std::endl;//nt x nplist x nx
-    for(int i_state= 0; i_state < rdata->nx; ++i_state) {
-        std::cout<<"\td("<<state_ids[i_state]<<")/d("
-                  <<parameter_ids[model->plist(i_nplist)]<<") = ";
+    std::cout << "State sensitivities for timepoint " << rdata->ts[i_time]
+              << std::endl; // nt x nplist x nx
+    for (int i_state = 0; i_state < rdata->nx; ++i_state) {
+        std::cout << "\td(" << state_ids[i_state] << ")/d("
+                  << parameter_ids[model->plist(i_nplist)] << ") = ";
 
         // rdata->sx is a flat 3D array in row-major ordering
-        std::cout<<rdata->sx[i_time * rdata->nplist * rdata->nx
-                              + i_nplist * rdata->nx
-                              + i_state];
-        std::cout<<std::endl;
+        std::cout << rdata->sx
+                         [i_time * rdata->nplist * rdata->nx
+                          + i_nplist * rdata->nx + i_state];
+        std::cout << std::endl;
     }
 
     return 0;
diff --git a/models/model_neuron/model_neuron.h b/models/model_neuron/model_neuron.h
index e744f57f65..387a3cadbd 100644
--- a/models/model_neuron/model_neuron.h
+++ b/models/model_neuron/model_neuron.h
@@ -1,6 +1,6 @@
 #ifndef _amici_model_neuron_h
 #define _amici_model_neuron_h
-/* Generated by amiwrap (R2017b) 223c5075608273b17f304556d0e8ccb41233bd21 */
+/* Generated by amiwrap (R2017b) 8b324bca5b796a93094195d22a023e5f8e945ef1 */
 #include <cmath>
 #include <memory>
 #include "amici/defines.h"
@@ -89,7 +89,7 @@ class Model_model_neuron : public amici::Model_ODE {
 
     amici::Model* clone() const override { return new Model_model_neuron(*this); };
 
-    std::string getAmiciCommit() const override { return "223c5075608273b17f304556d0e8ccb41233bd21"; };
+    std::string getAmiciCommit() const override { return "8b324bca5b796a93094195d22a023e5f8e945ef1"; };
 
     void fJSparse(SUNMatrixContent_Sparse JSparse, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *dwdx) override {
         JSparse_model_neuron(JSparse, t, x, p, k, h, w, dwdx);
@@ -160,10 +160,10 @@ class Model_model_neuron : public amici::Model_ODE {
     void fdsigmazdp(double *dsigmazdp, const realtype t, const realtype *p, const realtype *k, const int ip) override {
     }
 
-    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl) override {
+    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static) override {
     }
 
-    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) override {
+    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) override {
     }
 
     void fdxdotdp(realtype *dxdotdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *w, const realtype *dwdp) override {
@@ -216,7 +216,7 @@ class Model_model_neuron : public amici::Model_ODE {
         sz_model_neuron(sz, ie, t, x, p, k, h, sx, ip);
     }
 
-    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) override {
+    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) override {
     }
 
     void fx0(realtype *x0, const realtype t, const realtype *p, const realtype *k) override {
diff --git a/models/model_neuron_o2/CMakeLists.txt b/models/model_neuron_o2/CMakeLists.txt
index 42f5da90af..161fd4e9ce 100644
--- a/models/model_neuron_o2/CMakeLists.txt
+++ b/models/model_neuron_o2/CMakeLists.txt
@@ -1,5 +1,11 @@
 # Build AMICI model
 cmake_minimum_required(VERSION 3.15)
+cmake_policy(VERSION 3.15...3.27)
+
+# cmake >=3.27
+if(POLICY CMP0144)
+  cmake_policy(SET CMP0144 NEW)
+endif(POLICY CMP0144)
 
 project(model_neuron_o2)
 
@@ -14,7 +20,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 foreach(flag ${MY_CXX_FLAGS})
   unset(CUR_FLAG_SUPPORTED CACHE)
-  check_cxx_compiler_flag(-Werror ${flag} CUR_FLAG_SUPPORTED)
+  check_cxx_compiler_flag(${flag} CUR_FLAG_SUPPORTED)
   if(${CUR_FLAG_SUPPORTED})
     string(APPEND CMAKE_CXX_FLAGS " ${flag}")
   endif()
@@ -33,6 +39,23 @@ find_package(Amici  REQUIRED HINTS
              ${CMAKE_CURRENT_LIST_DIR}/../../build)
 message(STATUS "Found AMICI ${Amici_DIR}")
 
+# Debug build?
+if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
+  add_compile_options(-UNDEBUG)
+  if(MSVC)
+    add_compile_options(-DEBUG)
+  else()
+    add_compile_options(-O0 -g)
+  endif()
+  set(CMAKE_BUILD_TYPE "Debug")
+endif()
+
+# coverage options
+if($ENV{ENABLE_GCOV_COVERAGE})
+  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
+  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
+endif()
+
 set(MODEL_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 set(SRC_LIST_LIB ${MODEL_DIR}/JSparse.cpp
@@ -92,18 +115,6 @@ if(NOT "${AMICI_PYTHON_BUILD_EXT_ONLY}")
   target_link_libraries(simulate_${PROJECT_NAME} ${PROJECT_NAME})
 endif()
 
-# Debug build?
-if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
-  add_compile_options(-UNDEBUG -O0 -g)
-  set(CMAKE_BUILD_TYPE "Debug")
-endif()
-
-# coverage options
-if($ENV{ENABLE_GCOV_COVERAGE})
-  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
-endif()
-
 # SWIG
 option(ENABLE_SWIG "Build swig/python library?" ON)
 if(ENABLE_SWIG)
diff --git a/models/model_neuron_o2/dwdx.cpp b/models/model_neuron_o2/dwdx.cpp
index a746d7549a..3a2036c023 100644
--- a/models/model_neuron_o2/dwdx.cpp
+++ b/models/model_neuron_o2/dwdx.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_neuron_o2{
 
-void dwdx_model_neuron_o2(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) {
+void dwdx_model_neuron_o2(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) {
   dwdx[0] = 2.0/2.5E1;
   dwdx[1] = dwdx[0];
 }
diff --git a/models/model_neuron_o2/main.cpp b/models/model_neuron_o2/main.cpp
index 00a5e6b448..ecdff85a46 100644
--- a/models/model_neuron_o2/main.cpp
+++ b/models/model_neuron_o2/main.cpp
@@ -1,14 +1,13 @@
 #include <iostream>
 
-#include <amici/amici.h>    /* AMICI base functions */
-#include "wrapfunctions.h"  /* model-provided functions */
+#include "wrapfunctions.h" /* model-provided functions */
+#include <amici/amici.h>   /* AMICI base functions */
 
-template < class T >
-std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
-{
+template <class T>
+std::ostream& operator<<(std::ostream& os, std::vector<T> const& v) {
     os << "[";
-    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end(); ++ii)
-    {
+    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end();
+         ++ii) {
         os << " " << *ii;
     }
     os << "]";
@@ -21,9 +20,9 @@ std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
  */
 
 int main() {
-    std::cout<<"********************************"<<std::endl;
-    std::cout<<"** Running forward simulation **"<<std::endl;
-    std::cout<<"********************************"<<std::endl<<std::endl;
+    std::cout << "********************************" << std::endl;
+    std::cout << "** Running forward simulation **" << std::endl;
+    std::cout << "********************************" << std::endl << std::endl;
 
     // Create a model instance
     auto model = amici::generic_model::getModel();
@@ -44,21 +43,20 @@ int main() {
 
     // Print observable time course
     auto observable_ids = model->getObservableIds();
-    std::cout<<"Simulated observables for timepoints "<<rdata->ts<<"\n\n";
-    for(int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
-        std::cout<<observable_ids[i_observable]<<":\n\t";
-        for(int i_time = 0; i_time < rdata->nt; ++i_time) {
+    std::cout << "Simulated observables for timepoints " << rdata->ts << "\n\n";
+    for (int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
+        std::cout << observable_ids[i_observable] << ":\n\t";
+        for (int i_time = 0; i_time < rdata->nt; ++i_time) {
             // rdata->y is a flat 2D array in row-major ordering
-            std::cout<<rdata->y[i_time * rdata->ny + i_observable]<<" ";
+            std::cout << rdata->y[i_time * rdata->ny + i_observable] << " ";
         }
-        std::cout<<std::endl<<std::endl;
+        std::cout << std::endl << std::endl;
     }
 
-
-    std::cout<<std::endl;
-    std::cout<<"**********************************"<<std::endl;
-    std::cout<<"** Forward sensitivity analysis **"<<std::endl;
-    std::cout<<"**********************************"<<std::endl<<std::endl;
+    std::cout << std::endl;
+    std::cout << "**********************************" << std::endl;
+    std::cout << "** Forward sensitivity analysis **" << std::endl;
+    std::cout << "**********************************" << std::endl << std::endl;
 
     // Enable first-order sensitivity analysis
     solver->setSensitivityOrder(amici::SensitivityOrder::first);
@@ -78,18 +76,17 @@ int main() {
     auto state_ids = model->getStateIds();
     auto parameter_ids = model->getParameterIds();
 
-    std::cout<<"State sensitivities for timepoint "
-              <<rdata->ts[i_time]
-              <<std::endl;//nt x nplist x nx
-    for(int i_state= 0; i_state < rdata->nx; ++i_state) {
-        std::cout<<"\td("<<state_ids[i_state]<<")/d("
-                  <<parameter_ids[model->plist(i_nplist)]<<") = ";
+    std::cout << "State sensitivities for timepoint " << rdata->ts[i_time]
+              << std::endl; // nt x nplist x nx
+    for (int i_state = 0; i_state < rdata->nx; ++i_state) {
+        std::cout << "\td(" << state_ids[i_state] << ")/d("
+                  << parameter_ids[model->plist(i_nplist)] << ") = ";
 
         // rdata->sx is a flat 3D array in row-major ordering
-        std::cout<<rdata->sx[i_time * rdata->nplist * rdata->nx
-                              + i_nplist * rdata->nx
-                              + i_state];
-        std::cout<<std::endl;
+        std::cout << rdata->sx
+                         [i_time * rdata->nplist * rdata->nx
+                          + i_nplist * rdata->nx + i_state];
+        std::cout << std::endl;
     }
 
     return 0;
diff --git a/models/model_neuron_o2/model_neuron_o2.h b/models/model_neuron_o2/model_neuron_o2.h
index a108e6284b..4ae613ee84 100644
--- a/models/model_neuron_o2/model_neuron_o2.h
+++ b/models/model_neuron_o2/model_neuron_o2.h
@@ -1,6 +1,6 @@
 #ifndef _amici_model_neuron_o2_h
 #define _amici_model_neuron_o2_h
-/* Generated by amiwrap (R2017b) 223c5075608273b17f304556d0e8ccb41233bd21 */
+/* Generated by amiwrap (R2017b) 8b324bca5b796a93094195d22a023e5f8e945ef1 */
 #include <cmath>
 #include <memory>
 #include "amici/defines.h"
@@ -29,7 +29,7 @@ extern void deltasx_model_neuron_o2(double *deltasx, const realtype t, const rea
 extern void deltax_model_neuron_o2(double *deltax, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ie, const realtype *xdot, const realtype *xdot_old);
 extern void deltaxB_model_neuron_o2(double *deltaxB, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ie, const realtype *xdot, const realtype *xdot_old, const realtype *xB);
 extern void drzdx_model_neuron_o2(double *drzdx, const int ie, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h);
-extern void dwdx_model_neuron_o2(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl);
+extern void dwdx_model_neuron_o2(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static);
 extern void dxdotdp_model_neuron_o2(realtype *dxdotdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *w, const realtype *dwdp);
 extern void dydx_model_neuron_o2(double *dydx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *dwdx);
 extern void dzdx_model_neuron_o2(double *dzdx, const int ie, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h);
@@ -41,7 +41,7 @@ extern void srz_model_neuron_o2(double *srz, const int ie, const realtype t, con
 extern void stau_model_neuron_o2(double *stau, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *sx, const int ip, const int ie);
 extern void sx0_model_neuron_o2(realtype *sx0, const realtype t,const realtype *x0, const realtype *p, const realtype *k, const int ip);
 extern void sz_model_neuron_o2(double *sz, const int ie, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *sx, const int ip);
-extern void w_model_neuron_o2(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl);
+extern void w_model_neuron_o2(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static);
 extern void x0_model_neuron_o2(realtype *x0, const realtype t, const realtype *p, const realtype *k);
 extern void xdot_model_neuron_o2(realtype *xdot, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w);
 extern void y_model_neuron_o2(double *y, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w);
@@ -91,7 +91,7 @@ class Model_model_neuron_o2 : public amici::Model_ODE {
 
     amici::Model* clone() const override { return new Model_model_neuron_o2(*this); };
 
-    std::string getAmiciCommit() const override { return "223c5075608273b17f304556d0e8ccb41233bd21"; };
+    std::string getAmiciCommit() const override { return "8b324bca5b796a93094195d22a023e5f8e945ef1"; };
 
     void fJSparse(SUNMatrixContent_Sparse JSparse, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *dwdx) override {
         JSparse_model_neuron_o2(JSparse, t, x, p, k, h, w, dwdx);
@@ -162,11 +162,11 @@ class Model_model_neuron_o2 : public amici::Model_ODE {
     void fdsigmazdp(double *dsigmazdp, const realtype t, const realtype *p, const realtype *k, const int ip) override {
     }
 
-    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl) override {
+    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static) override {
     }
 
-    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) override {
-        dwdx_model_neuron_o2(dwdx, t, x, p, k, h, w, tcl, spl);
+    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) override {
+        dwdx_model_neuron_o2(dwdx, t, x, p, k, h, w, tcl, spl, include_static);
     }
 
     void fdxdotdp(realtype *dxdotdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *w, const realtype *dwdp) override {
@@ -219,8 +219,8 @@ class Model_model_neuron_o2 : public amici::Model_ODE {
         sz_model_neuron_o2(sz, ie, t, x, p, k, h, sx, ip);
     }
 
-    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) override {
-        w_model_neuron_o2(w, t, x, p, k, h, tcl, spl);
+    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) override {
+        w_model_neuron_o2(w, t, x, p, k, h, tcl, spl, include_static);
     }
 
     void fx0(realtype *x0, const realtype t, const realtype *p, const realtype *k) override {
diff --git a/models/model_neuron_o2/w.cpp b/models/model_neuron_o2/w.cpp
index cbd2f0a25f..fca88b9e36 100644
--- a/models/model_neuron_o2/w.cpp
+++ b/models/model_neuron_o2/w.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_neuron_o2{
 
-void w_model_neuron_o2(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) {
+void w_model_neuron_o2(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) {
   w[0] = x[0]*(2.0/2.5E1);
   w[1] = w[0]+5.0;
 }
diff --git a/models/model_robertson/CMakeLists.txt b/models/model_robertson/CMakeLists.txt
index 9b27e3daaf..1a4c57353a 100644
--- a/models/model_robertson/CMakeLists.txt
+++ b/models/model_robertson/CMakeLists.txt
@@ -1,5 +1,11 @@
 # Build AMICI model
 cmake_minimum_required(VERSION 3.15)
+cmake_policy(VERSION 3.15...3.27)
+
+# cmake >=3.27
+if(POLICY CMP0144)
+  cmake_policy(SET CMP0144 NEW)
+endif(POLICY CMP0144)
 
 project(model_robertson)
 
@@ -14,7 +20,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 foreach(flag ${MY_CXX_FLAGS})
   unset(CUR_FLAG_SUPPORTED CACHE)
-  check_cxx_compiler_flag(-Werror ${flag} CUR_FLAG_SUPPORTED)
+  check_cxx_compiler_flag(${flag} CUR_FLAG_SUPPORTED)
   if(${CUR_FLAG_SUPPORTED})
     string(APPEND CMAKE_CXX_FLAGS " ${flag}")
   endif()
@@ -33,6 +39,23 @@ find_package(Amici  REQUIRED HINTS
              ${CMAKE_CURRENT_LIST_DIR}/../../build)
 message(STATUS "Found AMICI ${Amici_DIR}")
 
+# Debug build?
+if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
+  add_compile_options(-UNDEBUG)
+  if(MSVC)
+    add_compile_options(-DEBUG)
+  else()
+    add_compile_options(-O0 -g)
+  endif()
+  set(CMAKE_BUILD_TYPE "Debug")
+endif()
+
+# coverage options
+if($ENV{ENABLE_GCOV_COVERAGE})
+  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
+  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
+endif()
+
 set(MODEL_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 set(SRC_LIST_LIB ${MODEL_DIR}/JSparse.cpp
@@ -74,18 +97,6 @@ if(NOT "${AMICI_PYTHON_BUILD_EXT_ONLY}")
   target_link_libraries(simulate_${PROJECT_NAME} ${PROJECT_NAME})
 endif()
 
-# Debug build?
-if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
-  add_compile_options(-UNDEBUG -O0 -g)
-  set(CMAKE_BUILD_TYPE "Debug")
-endif()
-
-# coverage options
-if($ENV{ENABLE_GCOV_COVERAGE})
-  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
-endif()
-
 # SWIG
 option(ENABLE_SWIG "Build swig/python library?" ON)
 if(ENABLE_SWIG)
diff --git a/models/model_robertson/dwdp.cpp b/models/model_robertson/dwdp.cpp
index 831c448cad..5911b99078 100644
--- a/models/model_robertson/dwdp.cpp
+++ b/models/model_robertson/dwdp.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_robertson{
 
-void dwdp_model_robertson(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl) {
+void dwdp_model_robertson(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static) {
   dwdp[0] = x[1]*x[2];
 }
 
diff --git a/models/model_robertson/dwdx.cpp b/models/model_robertson/dwdx.cpp
index 5c300a54ec..1e75c29246 100644
--- a/models/model_robertson/dwdx.cpp
+++ b/models/model_robertson/dwdx.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_robertson{
 
-void dwdx_model_robertson(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) {
+void dwdx_model_robertson(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) {
   dwdx[0] = p[1]*x[2];
   dwdx[1] = p[1]*x[1];
 }
diff --git a/models/model_robertson/main.cpp b/models/model_robertson/main.cpp
index 00a5e6b448..ecdff85a46 100644
--- a/models/model_robertson/main.cpp
+++ b/models/model_robertson/main.cpp
@@ -1,14 +1,13 @@
 #include <iostream>
 
-#include <amici/amici.h>    /* AMICI base functions */
-#include "wrapfunctions.h"  /* model-provided functions */
+#include "wrapfunctions.h" /* model-provided functions */
+#include <amici/amici.h>   /* AMICI base functions */
 
-template < class T >
-std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
-{
+template <class T>
+std::ostream& operator<<(std::ostream& os, std::vector<T> const& v) {
     os << "[";
-    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end(); ++ii)
-    {
+    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end();
+         ++ii) {
         os << " " << *ii;
     }
     os << "]";
@@ -21,9 +20,9 @@ std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
  */
 
 int main() {
-    std::cout<<"********************************"<<std::endl;
-    std::cout<<"** Running forward simulation **"<<std::endl;
-    std::cout<<"********************************"<<std::endl<<std::endl;
+    std::cout << "********************************" << std::endl;
+    std::cout << "** Running forward simulation **" << std::endl;
+    std::cout << "********************************" << std::endl << std::endl;
 
     // Create a model instance
     auto model = amici::generic_model::getModel();
@@ -44,21 +43,20 @@ int main() {
 
     // Print observable time course
     auto observable_ids = model->getObservableIds();
-    std::cout<<"Simulated observables for timepoints "<<rdata->ts<<"\n\n";
-    for(int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
-        std::cout<<observable_ids[i_observable]<<":\n\t";
-        for(int i_time = 0; i_time < rdata->nt; ++i_time) {
+    std::cout << "Simulated observables for timepoints " << rdata->ts << "\n\n";
+    for (int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
+        std::cout << observable_ids[i_observable] << ":\n\t";
+        for (int i_time = 0; i_time < rdata->nt; ++i_time) {
             // rdata->y is a flat 2D array in row-major ordering
-            std::cout<<rdata->y[i_time * rdata->ny + i_observable]<<" ";
+            std::cout << rdata->y[i_time * rdata->ny + i_observable] << " ";
         }
-        std::cout<<std::endl<<std::endl;
+        std::cout << std::endl << std::endl;
     }
 
-
-    std::cout<<std::endl;
-    std::cout<<"**********************************"<<std::endl;
-    std::cout<<"** Forward sensitivity analysis **"<<std::endl;
-    std::cout<<"**********************************"<<std::endl<<std::endl;
+    std::cout << std::endl;
+    std::cout << "**********************************" << std::endl;
+    std::cout << "** Forward sensitivity analysis **" << std::endl;
+    std::cout << "**********************************" << std::endl << std::endl;
 
     // Enable first-order sensitivity analysis
     solver->setSensitivityOrder(amici::SensitivityOrder::first);
@@ -78,18 +76,17 @@ int main() {
     auto state_ids = model->getStateIds();
     auto parameter_ids = model->getParameterIds();
 
-    std::cout<<"State sensitivities for timepoint "
-              <<rdata->ts[i_time]
-              <<std::endl;//nt x nplist x nx
-    for(int i_state= 0; i_state < rdata->nx; ++i_state) {
-        std::cout<<"\td("<<state_ids[i_state]<<")/d("
-                  <<parameter_ids[model->plist(i_nplist)]<<") = ";
+    std::cout << "State sensitivities for timepoint " << rdata->ts[i_time]
+              << std::endl; // nt x nplist x nx
+    for (int i_state = 0; i_state < rdata->nx; ++i_state) {
+        std::cout << "\td(" << state_ids[i_state] << ")/d("
+                  << parameter_ids[model->plist(i_nplist)] << ") = ";
 
         // rdata->sx is a flat 3D array in row-major ordering
-        std::cout<<rdata->sx[i_time * rdata->nplist * rdata->nx
-                              + i_nplist * rdata->nx
-                              + i_state];
-        std::cout<<std::endl;
+        std::cout << rdata->sx
+                         [i_time * rdata->nplist * rdata->nx
+                          + i_nplist * rdata->nx + i_state];
+        std::cout << std::endl;
     }
 
     return 0;
diff --git a/models/model_robertson/model_robertson.h b/models/model_robertson/model_robertson.h
index 816dd2db32..4f25f4d9bd 100644
--- a/models/model_robertson/model_robertson.h
+++ b/models/model_robertson/model_robertson.h
@@ -1,6 +1,6 @@
 #ifndef _amici_model_robertson_h
 #define _amici_model_robertson_h
-/* Generated by amiwrap (R2017b) 223c5075608273b17f304556d0e8ccb41233bd21 */
+/* Generated by amiwrap (R2017b) 8b324bca5b796a93094195d22a023e5f8e945ef1 */
 #include <cmath>
 #include <memory>
 #include "amici/defines.h"
@@ -19,12 +19,12 @@ extern void Jy_model_robertson(double *nllh, const int iy, const realtype *p, co
 extern void M_model_robertson(realtype *M, const realtype t, const realtype *x, const realtype *p, const realtype *k);
 extern void dJydsigma_model_robertson(double *dJydsigma, const int iy, const realtype *p, const realtype *k, const double *y, const double *sigmay, const double *my);
 extern void dJydy_model_robertson(double *dJydy, const int iy, const realtype *p, const realtype *k, const double *y, const double *sigmay, const double *my);
-extern void dwdp_model_robertson(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl);
-extern void dwdx_model_robertson(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl);
+extern void dwdp_model_robertson(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static);
+extern void dwdx_model_robertson(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static);
 extern void dxdotdp_model_robertson(realtype *dxdotdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *dx, const realtype *w, const realtype *dwdp);
 extern void dydx_model_robertson(double *dydx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *dwdx);
 extern void sigmay_model_robertson(double *sigmay, const realtype t, const realtype *p, const realtype *k, const realtype *y);
-extern void w_model_robertson(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl);
+extern void w_model_robertson(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static);
 extern void x0_model_robertson(realtype *x0, const realtype t, const realtype *p, const realtype *k);
 extern void xdot_model_robertson(realtype *xdot, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *dx, const realtype *w);
 extern void y_model_robertson(double *y, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w);
@@ -73,7 +73,7 @@ class Model_model_robertson : public amici::Model_DAE {
 
     amici::Model* clone() const override { return new Model_model_robertson(*this); };
 
-    std::string getAmiciCommit() const override { return "223c5075608273b17f304556d0e8ccb41233bd21"; };
+    std::string getAmiciCommit() const override { return "8b324bca5b796a93094195d22a023e5f8e945ef1"; };
 
     void fJSparse(SUNMatrixContent_Sparse JSparse, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype cj, const realtype *dx, const realtype *w, const realtype *dwdx) override {
         JSparse_model_robertson(JSparse, t, x, p, k, h, cj, dx, w, dwdx);
@@ -137,12 +137,12 @@ class Model_model_robertson : public amici::Model_DAE {
     void fdsigmazdp(double *dsigmazdp, const realtype t, const realtype *p, const realtype *k, const int ip) override {
     }
 
-    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl) override {
-        dwdp_model_robertson(dwdp, t, x, p, k, h, w, tcl, stcl, spl, sspl);
+    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static) override {
+        dwdp_model_robertson(dwdp, t, x, p, k, h, w, tcl, stcl, spl, sspl, include_static);
     }
 
-    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) override {
-        dwdx_model_robertson(dwdx, t, x, p, k, h, w, tcl, spl);
+    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) override {
+        dwdx_model_robertson(dwdx, t, x, p, k, h, w, tcl, spl, include_static);
     }
 
     void fdxdotdp(realtype *dxdotdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *dx, const realtype *w, const realtype *dwdp) override {
@@ -187,8 +187,8 @@ class Model_model_robertson : public amici::Model_DAE {
     void fsz(double *sz, const int ie, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *sx, const int ip) override {
     }
 
-    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) override {
-        w_model_robertson(w, t, x, p, k, h, tcl, spl);
+    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) override {
+        w_model_robertson(w, t, x, p, k, h, tcl, spl, include_static);
     }
 
     void fx0(realtype *x0, const realtype t, const realtype *p, const realtype *k) override {
diff --git a/models/model_robertson/w.cpp b/models/model_robertson/w.cpp
index 6905b49c0e..ae4145ba6b 100644
--- a/models/model_robertson/w.cpp
+++ b/models/model_robertson/w.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_robertson{
 
-void w_model_robertson(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) {
+void w_model_robertson(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) {
   w[0] = p[1]*x[1]*x[2];
 }
 
diff --git a/models/model_steadystate/CMakeLists.txt b/models/model_steadystate/CMakeLists.txt
index 9b699da5b0..3d0dacaf83 100644
--- a/models/model_steadystate/CMakeLists.txt
+++ b/models/model_steadystate/CMakeLists.txt
@@ -1,5 +1,11 @@
 # Build AMICI model
 cmake_minimum_required(VERSION 3.15)
+cmake_policy(VERSION 3.15...3.27)
+
+# cmake >=3.27
+if(POLICY CMP0144)
+  cmake_policy(SET CMP0144 NEW)
+endif(POLICY CMP0144)
 
 project(model_steadystate)
 
@@ -14,7 +20,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 foreach(flag ${MY_CXX_FLAGS})
   unset(CUR_FLAG_SUPPORTED CACHE)
-  check_cxx_compiler_flag(-Werror ${flag} CUR_FLAG_SUPPORTED)
+  check_cxx_compiler_flag(${flag} CUR_FLAG_SUPPORTED)
   if(${CUR_FLAG_SUPPORTED})
     string(APPEND CMAKE_CXX_FLAGS " ${flag}")
   endif()
@@ -33,6 +39,23 @@ find_package(Amici  REQUIRED HINTS
              ${CMAKE_CURRENT_LIST_DIR}/../../build)
 message(STATUS "Found AMICI ${Amici_DIR}")
 
+# Debug build?
+if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
+  add_compile_options(-UNDEBUG)
+  if(MSVC)
+    add_compile_options(-DEBUG)
+  else()
+    add_compile_options(-O0 -g)
+  endif()
+  set(CMAKE_BUILD_TYPE "Debug")
+endif()
+
+# coverage options
+if($ENV{ENABLE_GCOV_COVERAGE})
+  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
+  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
+endif()
+
 set(MODEL_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 set(SRC_LIST_LIB ${MODEL_DIR}/JSparse.cpp
@@ -73,18 +96,6 @@ if(NOT "${AMICI_PYTHON_BUILD_EXT_ONLY}")
   target_link_libraries(simulate_${PROJECT_NAME} ${PROJECT_NAME})
 endif()
 
-# Debug build?
-if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}")
-  add_compile_options(-UNDEBUG -O0 -g)
-  set(CMAKE_BUILD_TYPE "Debug")
-endif()
-
-# coverage options
-if($ENV{ENABLE_GCOV_COVERAGE})
-  string(APPEND CMAKE_CXX_FLAGS_DEBUG " --coverage")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " --coverage")
-endif()
-
 # SWIG
 option(ENABLE_SWIG "Build swig/python library?" ON)
 if(ENABLE_SWIG)
diff --git a/models/model_steadystate/dwdp.cpp b/models/model_steadystate/dwdp.cpp
index 154db2a72f..d31310d341 100644
--- a/models/model_steadystate/dwdp.cpp
+++ b/models/model_steadystate/dwdp.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_steadystate{
 
-void dwdp_model_steadystate(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl) {
+void dwdp_model_steadystate(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static) {
   dwdp[0] = x[2];
 }
 
diff --git a/models/model_steadystate/dwdx.cpp b/models/model_steadystate/dwdx.cpp
index d447f2140d..dcd5f5e49e 100644
--- a/models/model_steadystate/dwdx.cpp
+++ b/models/model_steadystate/dwdx.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_steadystate{
 
-void dwdx_model_steadystate(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) {
+void dwdx_model_steadystate(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) {
   dwdx[0] = x[0]*2.0;
   dwdx[1] = p[3];
 }
diff --git a/models/model_steadystate/main.cpp b/models/model_steadystate/main.cpp
index 00a5e6b448..ecdff85a46 100644
--- a/models/model_steadystate/main.cpp
+++ b/models/model_steadystate/main.cpp
@@ -1,14 +1,13 @@
 #include <iostream>
 
-#include <amici/amici.h>    /* AMICI base functions */
-#include "wrapfunctions.h"  /* model-provided functions */
+#include "wrapfunctions.h" /* model-provided functions */
+#include <amici/amici.h>   /* AMICI base functions */
 
-template < class T >
-std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
-{
+template <class T>
+std::ostream& operator<<(std::ostream& os, std::vector<T> const& v) {
     os << "[";
-    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end(); ++ii)
-    {
+    for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end();
+         ++ii) {
         os << " " << *ii;
     }
     os << "]";
@@ -21,9 +20,9 @@ std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
  */
 
 int main() {
-    std::cout<<"********************************"<<std::endl;
-    std::cout<<"** Running forward simulation **"<<std::endl;
-    std::cout<<"********************************"<<std::endl<<std::endl;
+    std::cout << "********************************" << std::endl;
+    std::cout << "** Running forward simulation **" << std::endl;
+    std::cout << "********************************" << std::endl << std::endl;
 
     // Create a model instance
     auto model = amici::generic_model::getModel();
@@ -44,21 +43,20 @@ int main() {
 
     // Print observable time course
     auto observable_ids = model->getObservableIds();
-    std::cout<<"Simulated observables for timepoints "<<rdata->ts<<"\n\n";
-    for(int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
-        std::cout<<observable_ids[i_observable]<<":\n\t";
-        for(int i_time = 0; i_time < rdata->nt; ++i_time) {
+    std::cout << "Simulated observables for timepoints " << rdata->ts << "\n\n";
+    for (int i_observable = 0; i_observable < rdata->ny; ++i_observable) {
+        std::cout << observable_ids[i_observable] << ":\n\t";
+        for (int i_time = 0; i_time < rdata->nt; ++i_time) {
             // rdata->y is a flat 2D array in row-major ordering
-            std::cout<<rdata->y[i_time * rdata->ny + i_observable]<<" ";
+            std::cout << rdata->y[i_time * rdata->ny + i_observable] << " ";
         }
-        std::cout<<std::endl<<std::endl;
+        std::cout << std::endl << std::endl;
     }
 
-
-    std::cout<<std::endl;
-    std::cout<<"**********************************"<<std::endl;
-    std::cout<<"** Forward sensitivity analysis **"<<std::endl;
-    std::cout<<"**********************************"<<std::endl<<std::endl;
+    std::cout << std::endl;
+    std::cout << "**********************************" << std::endl;
+    std::cout << "** Forward sensitivity analysis **" << std::endl;
+    std::cout << "**********************************" << std::endl << std::endl;
 
     // Enable first-order sensitivity analysis
     solver->setSensitivityOrder(amici::SensitivityOrder::first);
@@ -78,18 +76,17 @@ int main() {
     auto state_ids = model->getStateIds();
     auto parameter_ids = model->getParameterIds();
 
-    std::cout<<"State sensitivities for timepoint "
-              <<rdata->ts[i_time]
-              <<std::endl;//nt x nplist x nx
-    for(int i_state= 0; i_state < rdata->nx; ++i_state) {
-        std::cout<<"\td("<<state_ids[i_state]<<")/d("
-                  <<parameter_ids[model->plist(i_nplist)]<<") = ";
+    std::cout << "State sensitivities for timepoint " << rdata->ts[i_time]
+              << std::endl; // nt x nplist x nx
+    for (int i_state = 0; i_state < rdata->nx; ++i_state) {
+        std::cout << "\td(" << state_ids[i_state] << ")/d("
+                  << parameter_ids[model->plist(i_nplist)] << ") = ";
 
         // rdata->sx is a flat 3D array in row-major ordering
-        std::cout<<rdata->sx[i_time * rdata->nplist * rdata->nx
-                              + i_nplist * rdata->nx
-                              + i_state];
-        std::cout<<std::endl;
+        std::cout << rdata->sx
+                         [i_time * rdata->nplist * rdata->nx
+                          + i_nplist * rdata->nx + i_state];
+        std::cout << std::endl;
     }
 
     return 0;
diff --git a/models/model_steadystate/model_steadystate.h b/models/model_steadystate/model_steadystate.h
index 776b754b08..ca02261ef8 100644
--- a/models/model_steadystate/model_steadystate.h
+++ b/models/model_steadystate/model_steadystate.h
@@ -1,6 +1,6 @@
 #ifndef _amici_model_steadystate_h
 #define _amici_model_steadystate_h
-/* Generated by amiwrap (R2017b) 223c5075608273b17f304556d0e8ccb41233bd21 */
+/* Generated by amiwrap (R2017b) 8b324bca5b796a93094195d22a023e5f8e945ef1 */
 #include <cmath>
 #include <memory>
 #include "amici/defines.h"
@@ -18,12 +18,12 @@ extern void JSparse_model_steadystate(SUNMatrixContent_Sparse JSparse, const rea
 extern void Jy_model_steadystate(double *nllh, const int iy, const realtype *p, const realtype *k, const double *y, const double *sigmay, const double *my);
 extern void dJydsigma_model_steadystate(double *dJydsigma, const int iy, const realtype *p, const realtype *k, const double *y, const double *sigmay, const double *my);
 extern void dJydy_model_steadystate(double *dJydy, const int iy, const realtype *p, const realtype *k, const double *y, const double *sigmay, const double *my);
-extern void dwdp_model_steadystate(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl);
-extern void dwdx_model_steadystate(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl);
+extern void dwdp_model_steadystate(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static);
+extern void dwdx_model_steadystate(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static);
 extern void dxdotdp_model_steadystate(realtype *dxdotdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *w, const realtype *dwdp);
 extern void dydx_model_steadystate(double *dydx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *dwdx);
 extern void sigmay_model_steadystate(double *sigmay, const realtype t, const realtype *p, const realtype *k, const realtype *y);
-extern void w_model_steadystate(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl);
+extern void w_model_steadystate(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static);
 extern void x0_model_steadystate(realtype *x0, const realtype t, const realtype *p, const realtype *k);
 extern void xdot_model_steadystate(realtype *xdot, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w);
 extern void y_model_steadystate(double *y, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w);
@@ -72,7 +72,7 @@ class Model_model_steadystate : public amici::Model_ODE {
 
     amici::Model* clone() const override { return new Model_model_steadystate(*this); };
 
-    std::string getAmiciCommit() const override { return "223c5075608273b17f304556d0e8ccb41233bd21"; };
+    std::string getAmiciCommit() const override { return "8b324bca5b796a93094195d22a023e5f8e945ef1"; };
 
     void fJSparse(SUNMatrixContent_Sparse JSparse, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *dwdx) override {
         JSparse_model_steadystate(JSparse, t, x, p, k, h, w, dwdx);
@@ -132,12 +132,12 @@ class Model_model_steadystate : public amici::Model_ODE {
     void fdsigmazdp(double *dsigmazdp, const realtype t, const realtype *p, const realtype *k, const int ip) override {
     }
 
-    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl) override {
-        dwdp_model_steadystate(dwdp, t, x, p, k, h, w, tcl, stcl, spl, sspl);
+    void fdwdp(realtype *dwdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *stcl, const realtype *spl, const realtype *sspl, bool include_static) override {
+        dwdp_model_steadystate(dwdp, t, x, p, k, h, w, tcl, stcl, spl, sspl, include_static);
     }
 
-    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl) override {
-        dwdx_model_steadystate(dwdx, t, x, p, k, h, w, tcl, spl);
+    void fdwdx(realtype *dwdx, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *w, const realtype *tcl, const realtype *spl, bool include_static) override {
+        dwdx_model_steadystate(dwdx, t, x, p, k, h, w, tcl, spl, include_static);
     }
 
     void fdxdotdp(realtype *dxdotdp, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const int ip, const realtype *w, const realtype *dwdp) override {
@@ -182,8 +182,8 @@ class Model_model_steadystate : public amici::Model_ODE {
     void fsz(double *sz, const int ie, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *sx, const int ip) override {
     }
 
-    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) override {
-        w_model_steadystate(w, t, x, p, k, h, tcl, spl);
+    void fw(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) override {
+        w_model_steadystate(w, t, x, p, k, h, tcl, spl, include_static);
     }
 
     void fx0(realtype *x0, const realtype t, const realtype *p, const realtype *k) override {
diff --git a/models/model_steadystate/w.cpp b/models/model_steadystate/w.cpp
index 948d4529c2..5a0acafc83 100644
--- a/models/model_steadystate/w.cpp
+++ b/models/model_steadystate/w.cpp
@@ -10,7 +10,7 @@ namespace amici {
 
 namespace model_model_steadystate{
 
-void w_model_steadystate(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl) {
+void w_model_steadystate(realtype *w, const realtype t, const realtype *x, const realtype *p, const realtype *k, const realtype *h, const realtype *tcl, const realtype *spl, bool include_static) {
   w[0] = p[3]*x[2];
   w[1] = x[0]*x[0];
 }
diff --git a/python/sdist/amici/cxxcodeprinter.py b/python/sdist/amici/cxxcodeprinter.py
index 032089393d..adc4c25454 100644
--- a/python/sdist/amici/cxxcodeprinter.py
+++ b/python/sdist/amici/cxxcodeprinter.py
@@ -3,6 +3,7 @@
 import os
 import re
 from typing import Optional
+from collections.abc import Sequence
 from collections.abc import Iterable
 
 import sympy as sp
@@ -123,6 +124,7 @@ def _get_sym_lines_symbols(
         equations: sp.Matrix,
         variable: str,
         indent_level: int,
+        indices: Optional[Sequence[int]] = None,
     ) -> list[str]:
         """
         Generate C++ code for where array elements are directly replaced with
@@ -140,9 +142,19 @@ def _get_sym_lines_symbols(
         :param indent_level:
             indentation level (number of leading blanks)
 
+        :param indices:
+            Optional custom indices corresponding to entries in `symbols`.
+            Only used for comments.
+
         :return:
             C++ code as list of lines
         """
+        assert len(symbols) == len(equations)
+        if indices is None:
+            indices = range(len(symbols))
+        else:
+            assert len(indices) == len(symbols)
+
         indent = " " * indent_level
 
         def format_regular_line(symbol, math, index):
@@ -179,7 +191,9 @@ def format_regular_line(symbol, math, index):
                         for (identifier, definition) in expr_dict.items()
                     }
                 )
-                symbol_to_idx = {sym: idx for idx, sym in enumerate(symbols)}
+                symbol_to_idx = {
+                    sym: idx for idx, sym in zip(indices, symbols)
+                }
 
                 def format_line(symbol: sp.Symbol):
                     math = expr_dict[symbol]
@@ -203,7 +217,7 @@ def format_line(symbol: sp.Symbol):
 
         return [
             format_regular_line(sym, math, index)
-            for index, (sym, math) in enumerate(zip(symbols, equations))
+            for index, sym, math in zip(indices, symbols, equations)
             if math not in [0, 0.0]
         ]
 
diff --git a/python/sdist/amici/de_export.py b/python/sdist/amici/de_export.py
index be5a70e5cc..b853dd6ad0 100644
--- a/python/sdist/amici/de_export.py
+++ b/python/sdist/amici/de_export.py
@@ -179,14 +179,15 @@ def arguments(self, ode: bool = True) -> str:
         "realtype *dwdp, const realtype t, const realtype *x, "
         "const realtype *p, const realtype *k, const realtype *h, "
         "const realtype *w, const realtype *tcl, const realtype *dtcldp, "
-        "const realtype *spl, const realtype *sspl",
+        "const realtype *spl, const realtype *sspl, bool include_static",
         assume_pow_positivity=True,
         sparse=True,
     ),
     "dwdx": _FunctionInfo(
         "realtype *dwdx, const realtype t, const realtype *x, "
         "const realtype *p, const realtype *k, const realtype *h, "
-        "const realtype *w, const realtype *tcl, const realtype *spl",
+        "const realtype *w, const realtype *tcl, const realtype *spl, "
+        "bool include_static",
         assume_pow_positivity=True,
         sparse=True,
     ),
@@ -211,7 +212,7 @@ def arguments(self, ode: bool = True) -> str:
     "dwdw": _FunctionInfo(
         "realtype *dwdw, const realtype t, const realtype *x, "
         "const realtype *p, const realtype *k, const realtype *h, "
-        "const realtype *w, const realtype *tcl",
+        "const realtype *w, const realtype *tcl, bool include_static",
         assume_pow_positivity=True,
         sparse=True,
     ),
@@ -331,7 +332,8 @@ def arguments(self, ode: bool = True) -> str:
     "w": _FunctionInfo(
         "realtype *w, const realtype t, const realtype *x, "
         "const realtype *p, const realtype *k, "
-        "const realtype *h, const realtype *tcl, const realtype *spl",
+        "const realtype *h, const realtype *tcl, const realtype *spl, "
+        "bool include_static",
         assume_pow_positivity=True,
     ),
     "x0": _FunctionInfo(
@@ -612,6 +614,10 @@ class DEModel:
         whether all observables have a gaussian noise model, i.e. whether
         res and FIM make sense.
 
+    :ivar _static_indices:
+        dict of lists list of indices of static variables for different
+        model entities.
+
     :ivar _z2event:
         list of event indices for each event observable
     """
@@ -749,6 +755,8 @@ def cached_simplify(
         self._has_quadratic_nllh: bool = True
         set_log_level(logger, verbose)
 
+        self._static_indices: dict[str, list[int]] = {}
+
     def differential_states(self) -> list[DifferentialState]:
         """Get all differential states."""
         return self._differential_states
@@ -1345,6 +1353,153 @@ def free_symbols(self) -> set[sp.Basic]:
             )
         )
 
+    def static_indices(self, name: str) -> list[int]:
+        """
+        Returns the indices of static expressions in the given model entity.
+
+        Static expressions are those that do not depend on time,
+        neither directly nor indirectly.
+
+        :param name: Name of the model entity.
+        :return: List of indices of static expressions.
+        """
+        # already computed?
+        if (res := self._static_indices.get(name)) is not None:
+            return res
+
+        if name == "w":
+            dwdx = self.sym("dwdx")
+            dwdw = self.sym("dwdw")
+            w = self.eq("w")
+
+            # Check for direct (via `t`) or indirect (via `x`, `h`, or splines)
+            # time dependency.
+            # To avoid lengthy symbolic computations, we only check if we have
+            # any non-zeros in hierarchy. We currently neglect the case where
+            # different hierarchy levels may cancel out. Treating a static
+            # expression as dynamic in such rare cases shouldn't be a problem.
+            dynamic_dependency = np.asarray(
+                dwdx.applyfunc(lambda x: int(not x.is_zero))
+            ).astype(np.int64)
+            # to check for other time-dependence, we add a column to the dwdx
+            #  matrix
+            dynamic_syms = [
+                # FIXME: see spline comment below
+                # *self.sym("spl"),
+                *self.sym("h"),
+                amici_time_symbol,
+            ]
+            dynamic_dependency = np.hstack(
+                (
+                    dynamic_dependency,
+                    np.array(
+                        [
+                            expr.has(*dynamic_syms)
+                            # FIXME: the current spline implementation is a giant pita
+                            #  currently, the splines occur in the form of sympy functions, e.g.:
+                            #   AmiciSpline(y0, time, y0_3, y0_1)
+                            #   AmiciSplineSensitivity(y0, time, y0_1, y0_3, y0_1)
+                            #  until it uses the proper self.sym("spl") / self.sym("sspl")
+                            #  symbols, which will require quite some refactoring,
+                            #  we just do dumb string checks :|
+                            or (
+                                bool(self._splines)
+                                and "AmiciSpline" in str(expr)
+                            )
+                            for expr in w
+                        ]
+                    )[:, np.newaxis],
+                )
+            )
+
+            nonzero_dwdw = np.asarray(
+                dwdw.applyfunc(lambda x: int(not x.is_zero))
+            ).astype(np.int64)
+
+            # `w` is made up an expression hierarchy. Any given entry is only
+            # static if all its dependencies are static. Here, we unravel
+            # the hierarchical structure of `w`.
+            # If for an entry in `w`, the row sum of the intermediate products
+            # is 0 across all levels, the expression is static.
+            tmp = dynamic_dependency
+            res = np.sum(tmp, axis=1)
+            while np.any(tmp != 0):
+                tmp = nonzero_dwdw.dot(tmp)
+                res += np.sum(tmp, axis=1)
+            self._static_indices[name] = (
+                np.argwhere(res == 0).flatten().tolist()
+            )
+
+            return self._static_indices[name]
+
+        if name in ("dwdw", "dwdx", "dwdp"):
+            static_indices_w = set(self.static_indices("w"))
+            dynamic_syms = [
+                *(
+                    sym
+                    for i, sym in enumerate(self.sym("w"))
+                    if i not in static_indices_w
+                ),
+                amici_time_symbol,
+                *self.sym("x"),
+                *self.sym("h"),
+                # FIXME see spline comment above
+                # *(self.sym("spl") if name in ("dwdw", "dwdx") else ()),
+                # *(self.sym("sspl") if name == "dwdp" else ()),
+            ]
+            dynamic_syms = sp.Matrix(dynamic_syms)
+            rowvals = self.rowvals(name)
+            sparseeq = self.sparseeq(name)
+
+            # collect the indices of static expressions of dwd* from the list
+            #  of non-zeros entries of the sparse matrix
+            self._static_indices[name] = [
+                i
+                for i, (expr, row_idx) in enumerate(zip(sparseeq, rowvals))
+                # derivative of a static expression is static
+                if row_idx in static_indices_w
+                # constant expressions
+                or expr.is_Number
+                # check for dependencies on non-static entities
+                or (
+                    # FIXME see spline comment above
+                    #  (check str before diff, as diff will fail on spline functions)
+                    (
+                        # splines: non-static
+                        not self._splines or "AmiciSpline" not in str(expr)
+                    )
+                    and (
+                        # If the expression contains dynamic symbols, it might
+                        # still be static. However, checking the derivative
+                        # is currently too expensive, and we rather accept
+                        # false negatives.
+                        not expr.has(*dynamic_syms)
+                        # or all(
+                        #     expr.diff(dyn_sym).is_zero
+                        #     for dyn_sym in dynamic_syms
+                        # )
+                    )
+                )
+            ]
+            return self._static_indices[name]
+
+        raise NotImplementedError(name)
+
+    def dynamic_indices(self, name: str) -> list[int]:
+        """
+        Return the indices of dynamic expressions in the given model entity.
+
+        :param name: Name of the model entity.
+        :return: List of indices of dynamic expressions.
+        """
+        static_idxs = set(self.static_indices(name))
+        length = len(
+            self.sparsesym(name)
+            if name in sparse_functions
+            else self.sym(name)
+        )
+        return [i for i in range(length) if i not in static_idxs]
+
     def _generate_symbol(self, name: str) -> None:
         """
         Generates the symbolic identifiers for a symbolic variable
@@ -3261,9 +3416,57 @@ def _get_function_body(
                 symbols = list(map(sp.Symbol, self.model.sparsesym(function)))
             else:
                 symbols = self.model.sym(function)
-            lines += self._code_printer._get_sym_lines_symbols(
-                symbols, equations, function, 4
-            )
+
+            if function in ("w", "dwdw", "dwdx", "dwdp"):
+                # Split into a block of static and dynamic expressions.
+                if len(static_idxs := self.model.static_indices(function)) > 0:
+                    tmp_symbols = sp.Matrix(
+                        [[symbols[i]] for i in static_idxs]
+                    )
+                    tmp_equations = sp.Matrix(
+                        [equations[i] for i in static_idxs]
+                    )
+                    tmp_lines = self._code_printer._get_sym_lines_symbols(
+                        tmp_symbols,
+                        tmp_equations,
+                        function,
+                        8,
+                        static_idxs,
+                    )
+                    if tmp_lines:
+                        lines.extend(
+                            [
+                                "    // static expressions",
+                                "    if (include_static) {",
+                                *tmp_lines,
+                                "    }",
+                            ]
+                        )
+
+                # dynamic expressions
+                if len(dynamic_idxs := self.model.dynamic_indices(function)):
+                    tmp_symbols = sp.Matrix(
+                        [[symbols[i]] for i in dynamic_idxs]
+                    )
+                    tmp_equations = sp.Matrix(
+                        [equations[i] for i in dynamic_idxs]
+                    )
+
+                    tmp_lines = self._code_printer._get_sym_lines_symbols(
+                        tmp_symbols,
+                        tmp_equations,
+                        function,
+                        4,
+                        dynamic_idxs,
+                    )
+                    if tmp_lines:
+                        lines.append("\n    // dynamic expressions")
+                        lines.extend(tmp_lines)
+
+            else:
+                lines += self._code_printer._get_sym_lines_symbols(
+                    symbols, equations, function, 4
+                )
 
         else:
             lines += self._code_printer._get_sym_lines_array(
@@ -3808,7 +4011,7 @@ def get_model_override_implementation(
     body = (
         ""
         if nobody
-        else "\n{ind8}{maybe_return}{fun}_{name}({eval_signature});{ind4}\n".format(
+        else "\n{ind8}{maybe_return}{fun}_{name}({eval_signature});\n{ind4}".format(
             ind4=" " * 4,
             ind8=" " * 8,
             maybe_return="" if func_info.return_type == "void" else "return ",
@@ -3855,7 +4058,9 @@ def get_sunindex_override_implementation(
     if nobody:
         impl += "}}\n"
     else:
-        impl += "{ind8}{fun}_{indextype}_{name}({eval_signature});\n{ind4}}}\n"
+        impl += (
+            "\n{ind8}{fun}_{indextype}_{name}({eval_signature});\n{ind4}}}\n"
+        )
 
     return impl.format(
         ind4=" " * 4,
@@ -3892,6 +4097,7 @@ def remove_argument_types(signature: str) -> str:
         "realtype *",
         "const int ",
         "int ",
+        "bool ",
         "SUNMatrixContent_Sparse ",
         "gsl::span<const int>",
     ]
diff --git a/src/abstract_model.cpp b/src/abstract_model.cpp
index 041d06b361..dfa0780535 100644
--- a/src/abstract_model.cpp
+++ b/src/abstract_model.cpp
@@ -437,10 +437,11 @@ void AbstractModel::fdJrzdsigma(
     );
 }
 
-void AbstractModel::
-    fw(realtype* /*w*/, realtype const /*t*/, realtype const* /*x*/,
-       realtype const* /*p*/, realtype const* /*k*/, realtype const* /*h*/,
-       realtype const* /*tcl*/, realtype const* /*spl*/) {
+void AbstractModel::fw(
+    realtype* /*w*/, realtype const /*t*/, realtype const* /*x*/,
+    realtype const* /*p*/, realtype const* /*k*/, realtype const* /*h*/,
+    realtype const* /*tcl*/, realtype const* /*spl*/, bool /*include_static*/
+) {
     throw AmiException(
         "Requested functionality is not supported as %s is "
         "not implemented for this model!",
@@ -452,7 +453,7 @@ void AbstractModel::fdwdp(
     realtype* /*dwdp*/, realtype const /*t*/, realtype const* /*x*/,
     realtype const* /*p*/, realtype const* /*k*/, realtype const* /*h*/,
     realtype const* /*w*/, realtype const* /*tcl*/, realtype const* /*stcl*/,
-    realtype const* /*spl*/, realtype const* /*sspl*/
+    realtype const* /*spl*/, realtype const* /*sspl*/, bool /*include_static*/
 ) {
     throw AmiException(
         "Requested functionality is not supported as %s is "
@@ -477,23 +478,11 @@ void AbstractModel::fdwdp_rowvals(SUNMatrixWrapper& /*dwdp*/) {
     );
 }
 
-void AbstractModel::fdwdp(
-    realtype* /*dwdp*/, realtype const /*t*/, realtype const* /*x*/,
-    realtype const* /*p*/, realtype const* /*k*/, realtype const* /*h*/,
-    realtype const* /*w*/, realtype const* /*tcl*/, realtype const* /*stcl*/,
-    realtype const* /*spl*/, realtype const* /*sspl*/, int const /*ip*/
-) {
-    throw AmiException(
-        "Requested functionality is not supported as %s is "
-        "not implemented for this model!",
-        __func__
-    );
-}
-
 void AbstractModel::fdwdx(
     realtype* /*dwdx*/, realtype const /*t*/, realtype const* /*x*/,
     realtype const* /*p*/, realtype const* /*k*/, realtype const* /*h*/,
-    realtype const* /*w*/, realtype const* /*tcl*/, realtype const* /*spl*/
+    realtype const* /*w*/, realtype const* /*tcl*/, realtype const* /*spl*/,
+    bool /*include_static*/
 ) {
     throw AmiException(
         "Requested functionality is not supported as %s is "
@@ -521,7 +510,7 @@ void AbstractModel::fdwdx_rowvals(SUNMatrixWrapper& /*dwdx*/) {
 void AbstractModel::fdwdw(
     realtype* /*dwdw*/, realtype /*t*/, realtype const* /*x*/,
     realtype const* /*p*/, realtype const* /*k*/, realtype const* /*h*/,
-    realtype const* /*w*/, realtype const* /*tcl*/
+    realtype const* /*w*/, realtype const* /*tcl*/, bool /*include_static*/
 ) {
     throw AmiException(
         "Requested functionality is not supported as %s "
diff --git a/src/model.cpp b/src/model.cpp
index 3478610bbe..54363d8d1b 100644
--- a/src/model.cpp
+++ b/src/model.cpp
@@ -323,6 +323,31 @@ void Model::initialize(
 
     if (ne)
         initEvents(x, dx, roots_found);
+
+    // evaluate static expressions once
+    auto x_pos = computeX_pos(x);
+    fw(t0(), x_pos, true);
+    fdwdw(t0(), x_pos, true);
+    fdwdx(t0(), x_pos, true);
+    if (computeSensitivities) {
+        fdwdp(t0(), x_pos, true);
+    }
+}
+
+void Model::reinitialize(
+    realtype t, AmiVector& x, AmiVectorArray& sx, bool computeSensitivities
+) {
+    fx0_fixedParameters(x);
+
+    // re-evaluate static expressions once
+    auto x_pos = computeX_pos(x);
+    fw(t, x_pos, true);
+    fdwdw(t, x_pos, true);
+    fdwdx(t, x_pos, true);
+    if (computeSensitivities) {
+        fsx0_fixedParameters(sx, x);
+        fdwdp(t, x_pos, true);
+    }
 }
 
 void Model::initializeB(
@@ -1048,7 +1073,7 @@ void Model::requireSensitivitiesForAllParameters() {
 void Model::getExpression(
     gsl::span<realtype> w, realtype const t, AmiVector const& x
 ) {
-    fw(t, computeX_pos(x));
+    fw(t, computeX_pos(x), false);
     writeSlice(derived_state_.w_, w);
 }
 
@@ -1469,7 +1494,7 @@ void Model::addStateSensitivityEventUpdate(
     AmiVector const& xdot, AmiVector const& xdot_old,
     std::vector<realtype> const& stau
 ) {
-    fw(t, x_old.data());
+    fw(t, x_old.data(), false);
 
     for (int ip = 0; ip < nplist(); ip++) {
 
@@ -2040,7 +2065,7 @@ void Model::fy(realtype const t, AmiVector const& x) {
 
     derived_state_.y_.assign(ny, 0.0);
 
-    fw(t, x_pos);
+    fw(t, x_pos, false);
     fy(derived_state_.y_.data(), t, x_pos, state_.unscaledParameters.data(),
        state_.fixedParameters.data(), state_.h.data(),
        derived_state_.w_.data());
@@ -2059,8 +2084,8 @@ void Model::fdydp(realtype const t, AmiVector const& x) {
     auto x_pos = computeX_pos(x);
 
     derived_state_.dydp_.assign(ny * nplist(), 0.0);
-    fw(t, x_pos);
-    fdwdp(t, x_pos);
+    fw(t, x_pos, false);
+    fdwdp(t, x_pos, false);
 
     /* get dydp slice (ny) for current time and parameter */
     for (int ip = 0; ip < nplist(); ip++)
@@ -2094,8 +2119,8 @@ void Model::fdydx(realtype const t, AmiVector const& x) {
 
     derived_state_.dydx_.assign(ny * nx_solver, 0.0);
 
-    fw(t, x_pos);
-    fdwdx(t, x_pos);
+    fw(t, x_pos, false);
+    fdwdx(t, x_pos, false);
     fdydx(
         derived_state_.dydx_.data(), t, x_pos, state_.unscaledParameters.data(),
         state_.fixedParameters.data(), state_.h.data(),
@@ -2840,38 +2865,42 @@ void Model::fsspl(realtype const t) {
     }
 }
 
-void Model::fw(realtype const t, realtype const* x) {
-    std::fill(derived_state_.w_.begin(), derived_state_.w_.end(), 0.0);
+void Model::fw(realtype const t, realtype const* x, bool include_static) {
+    if (include_static) {
+        std::fill(derived_state_.w_.begin(), derived_state_.w_.end(), 0.0);
+    }
     fspl(t);
     fw(derived_state_.w_.data(), t, x, state_.unscaledParameters.data(),
        state_.fixedParameters.data(), state_.h.data(), state_.total_cl.data(),
-       state_.spl_.data());
+       state_.spl_.data(), include_static);
 
     if (always_check_finite_) {
         checkFinite(derived_state_.w_, ModelQuantity::w);
     }
 }
 
-void Model::fdwdp(realtype const t, realtype const* x) {
+void Model::fdwdp(realtype const t, realtype const* x, bool include_static) {
     if (!nw)
         return;
 
-    fw(t, x);
+    fw(t, x, include_static);
     derived_state_.dwdp_.zero();
     if (pythonGenerated) {
-        if (!dwdp_hierarchical_.at(0).capacity())
+        if (!ndwdp)
             return;
         fsspl(t);
-        fdwdw(t, x);
-        dwdp_hierarchical_.at(0).zero();
-        fdwdp_colptrs(dwdp_hierarchical_.at(0));
-        fdwdp_rowvals(dwdp_hierarchical_.at(0));
+        fdwdw(t, x, include_static);
+        if (include_static) {
+            dwdp_hierarchical_.at(0).zero();
+            fdwdp_colptrs(dwdp_hierarchical_.at(0));
+            fdwdp_rowvals(dwdp_hierarchical_.at(0));
+        }
         fdwdp(
             dwdp_hierarchical_.at(0).data(), t, x,
             state_.unscaledParameters.data(), state_.fixedParameters.data(),
             state_.h.data(), derived_state_.w_.data(), state_.total_cl.data(),
             state_.stotal_cl.data(), state_.spl_.data(),
-            derived_state_.sspl_.data()
+            derived_state_.sspl_.data(), include_static
         );
 
         for (int irecursion = 1; irecursion <= w_recursion_depth_;
@@ -2901,25 +2930,29 @@ void Model::fdwdp(realtype const t, realtype const* x) {
     }
 }
 
-void Model::fdwdx(realtype const t, realtype const* x) {
+void Model::fdwdx(realtype const t, realtype const* x, bool include_static) {
     if (!nw)
         return;
 
-    fw(t, x);
+    fw(t, x, include_static);
 
     derived_state_.dwdx_.zero();
     if (pythonGenerated) {
         if (!dwdx_hierarchical_.at(0).capacity())
             return;
-        fdwdw(t, x);
-        dwdx_hierarchical_.at(0).zero();
-        fdwdx_colptrs(dwdx_hierarchical_.at(0));
-        fdwdx_rowvals(dwdx_hierarchical_.at(0));
+
+        fdwdw(t, x, include_static);
+
+        if (include_static) {
+            dwdx_hierarchical_.at(0).zero();
+            fdwdx_colptrs(dwdx_hierarchical_.at(0));
+            fdwdx_rowvals(dwdx_hierarchical_.at(0));
+        }
         fdwdx(
             dwdx_hierarchical_.at(0).data(), t, x,
             state_.unscaledParameters.data(), state_.fixedParameters.data(),
             state_.h.data(), derived_state_.w_.data(), state_.total_cl.data(),
-            state_.spl_.data()
+            state_.spl_.data(), include_static
         );
 
         for (int irecursion = 1; irecursion <= w_recursion_depth_;
@@ -2947,16 +2980,20 @@ void Model::fdwdx(realtype const t, realtype const* x) {
     }
 }
 
-void Model::fdwdw(realtype const t, realtype const* x) {
-    if (!nw || !dwdw_.capacity())
+void Model::fdwdw(realtype const t, realtype const* x, bool include_static) {
+    if (!ndwdw)
         return;
-    dwdw_.zero();
-    fdwdw_colptrs(dwdw_);
-    fdwdw_rowvals(dwdw_);
+
+    if (include_static) {
+        dwdw_.zero();
+        fdwdw_colptrs(dwdw_);
+        fdwdw_rowvals(dwdw_);
+    }
+
     fdwdw(
         dwdw_.data(), t, x, state_.unscaledParameters.data(),
         state_.fixedParameters.data(), state_.h.data(),
-        derived_state_.w_.data(), state_.total_cl.data()
+        derived_state_.w_.data(), state_.total_cl.data(), include_static
     );
 
     if (always_check_finite_) {
diff --git a/src/model_dae.cpp b/src/model_dae.cpp
index a3a8aaea26..ad397bc82f 100644
--- a/src/model_dae.cpp
+++ b/src/model_dae.cpp
@@ -31,7 +31,7 @@ void Model_DAE::fJSparse(
     realtype t, realtype cj, const_N_Vector x, const_N_Vector dx, SUNMatrix J
 ) {
     auto x_pos = computeX_pos(x);
-    fdwdx(t, N_VGetArrayPointerConst(x_pos));
+    fdwdx(t, N_VGetArrayPointerConst(x_pos), false);
     if (pythonGenerated) {
         auto JSparse = SUNMatrixWrapper(J);
         // python generated
@@ -122,7 +122,7 @@ void Model_DAE::fxdot(
     realtype t, const_N_Vector x, const_N_Vector dx, N_Vector xdot
 ) {
     auto x_pos = computeX_pos(x);
-    fw(t, N_VGetArrayPointerConst(x));
+    fw(t, N_VGetArrayPointerConst(x), false);
     N_VConst(0.0, xdot);
     fxdot(
         N_VGetArrayPointer(xdot), t, N_VGetArrayPointerConst(x_pos),
@@ -171,7 +171,7 @@ void Model_DAE::fdxdotdp(
         );
     } else {
         // matlab generated
-        fdwdp(t, N_VGetArrayPointerConst(x_pos));
+        fdwdp(t, N_VGetArrayPointerConst(x_pos), false);
 
         for (int ip = 0; ip < nplist(); ip++) {
             N_VConst(0.0, derived_state_.dxdotdp.getNVector(ip));
diff --git a/src/model_ode.cpp b/src/model_ode.cpp
index 257ef45289..e3e401e1bf 100644
--- a/src/model_ode.cpp
+++ b/src/model_ode.cpp
@@ -29,7 +29,7 @@ void Model_ODE::fJSparse(
 
 void Model_ODE::fJSparse(realtype t, const_N_Vector x, SUNMatrix J) {
     auto x_pos = computeX_pos(x);
-    fdwdx(t, N_VGetArrayPointerConst(x_pos));
+    fdwdx(t, N_VGetArrayPointerConst(x_pos), false);
     if (pythonGenerated) {
         auto JSparse = SUNMatrixWrapper(J);
         // python generated
@@ -143,7 +143,7 @@ void Model_ODE::fdxdotdw(realtype const t, const_N_Vector x) {
 
 void Model_ODE::fdxdotdp(realtype const t, const_N_Vector x) {
     auto x_pos = computeX_pos(x);
-    fdwdp(t, N_VGetArrayPointerConst(x_pos));
+    fdwdp(t, N_VGetArrayPointerConst(x_pos), false);
 
     if (pythonGenerated) {
         // python generated
diff --git a/src/solver.cpp b/src/solver.cpp
index 1a74e8b44b..2caa9d8bc0 100644
--- a/src/solver.cpp
+++ b/src/solver.cpp
@@ -251,13 +251,14 @@ void Solver::setupSteadystate(
 }
 
 void Solver::updateAndReinitStatesAndSensitivities(Model* model) const {
-    model->fx0_fixedParameters(x_);
-    reInit(t_, x_, dx_);
+    model->reinitialize(
+        t_, x_, sx_, getSensitivityOrder() >= SensitivityOrder::first
+    );
 
-    if (getSensitivityOrder() >= SensitivityOrder::first) {
-        model->fsx0_fixedParameters(sx_, x_);
-        if (getSensitivityMethod() == SensitivityMethod::forward)
-            sensReInit(sx_, sdx_);
+    reInit(t_, x_, dx_);
+    if (getSensitivityOrder() >= SensitivityOrder::first
+        && getSensitivityMethod() == SensitivityMethod::forward) {
+        sensReInit(sx_, sdx_);
     }
 }
 
diff --git a/swig/model.i b/swig/model.i
index ee3286e1a4..fdb8ad9c85 100644
--- a/swig/model.i
+++ b/swig/model.i
@@ -37,6 +37,7 @@ using namespace amici;
 %ignore initializeB;
 %ignore initializeStateSensitivities;
 %ignore initializeStates;
+%ignore reinitialize;
 %ignore ModelState;
 %ignore getModelState;
 %ignore setModelState;