Adjusting GroupId