(QENG-299) Added support for EOS

Is this part of the EOS work?