[refactor] adjusted to new Group.Builder