Added some manual Annotations