Improved bookmark support