Make GroupId explicit