Use new model for state.json