Content assist support for annexes