GroupId added to sample point
Update SamplingPoint corrected