Added some more EOS functionality