Improvement of annotation handling