Issue #153: Annotations