Changes to bookmark index and bookmark class