Scenes are now managed in one place