Increment/decrement is functional. Persistence has been changed a bit