Bookmark mechanism now uses Objects rather than String primatives for storage.