Updated framework for switching scenes