Add support for querying and rendering annotations.