Optimisation for State performance