Updated for new bookmark object