Updated methods to deal with bookmarks