More commits for the annotator client.