(QENG-299) Added support for EOS