Annotations are properly linked to elements now