Updated with new classes for bookmarket and search_books