[Experimental] Add bookmarks