Annotation changes

Refs #838