(QENG-299) Added support for EOS

yeah, I think I can do that in a subsequent commit.