Update to Bookmark functions and samples