Updated group builder