I totally understand this.
The general solution is save states supporting that have been confirmed to be supported in the future release :)
