Adding annotations.
Few changes