Add support for bookmarks