Add incr/decr support