Changed way of storing Scenes