Adding more scenarios and storage in EOS