Enhanced Annotator interface