Add structural support for incremental annotations