Added core features for handling bookmarks