Working with Annotated Diagrams