Should I move the AnnotationValidator?