Better definition of annotations targets