Improved experience handling