Better state switching support