Updated to Annotator 74bf6fe4 (typed-packaging branch)
Follow Annotator changes