Updating scenario store to keep scenario objects instead of just names