Standardize GroupId type and usage