Add BookmarkManager, NoteManager