Added some (not all) EOS functionality