improvements for annotation handling