Changed AbstractAnnotator to BaseAnnotator