Annotator work in progress: replace old annotator client.