Keep better track of model state