Add groups to support locales