Improved preset handling