add support for annotated tags