Modified some of the annotations