New Annotators.

Annotators haven been adapted to the new version.