More upgrade work.
Annotator upgrade work.