Updated Annotations Class