[refactor] adjusted to new GRoup.Builder constructor