Issue #14, Issue #15, Issue #16: Annotations