Added more stuff for saving bookmarks