Added full bookmarks implementation.