Update compatibility to be less strict
New state implementation!