Changes to make group identifiers strings rather than integers