Adding support+tests for annotated tags.

Feedback is always appreciated!