Adding Annotation and minor updates