Improved history support