Proposed changes to annotation model