Added possibilities to turn on/off updating for states