Added Bookmarks handling.