Add Bookmark model; Fix things after Yurii