Annotators haven been adapted to the new version. Added some tests