Update to support synthetic data generator (regex)