Update currentStateModel to work with controller