Changing how annotations are stored