Slight change to GroupAnnotation to support initial implementation

Change-Id: Id04e9fbf586234b41bcf5a898715a3c98d4a8eba