Added group persistence.