Supported ArrowState. Correct some EOS behaviour