Adding group and client types for groups and clients in staging and prod