adding support for bookmarks