Adding support+tests for annotated tags.