Improved preset support