Adding support for autoplot-bookmarks