diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..947d515
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+env/
+test_out/
+stress_test_pb2.py
+__pycache__/
diff --git a/README.md b/README.md
index 35f73be..a133937 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,8 @@
 
 1.  Please follow the guide in "Train voice model" chapter in [OEM Hotword Stress Test with OpenHST](https://docs.google.com/presentation/d/e/2PACX-1vR5kjJfMZGMLMeyFV3AmzgGT1gniS1URztYqv4IJleWiSAtDNYNodsF1FMJHT57duP8CPr5oXvEEqCb/pub?start=false&loop=false&delayms=3000)
 
+**Note** for voice match with query phrases, please use `enroll_with_queries` as test_name for voice match enrollment.
+
 ## Stress Test
 
 Please refer to the guide in "Run Stress Test" chapter in  [OEM Hotword Stress Test with OpenHST](https://docs.google.com/presentation/d/e/2PACX-1vR5kjJfMZGMLMeyFV3AmzgGT1gniS1URztYqv4IJleWiSAtDNYNodsF1FMJHT57duP8CPr5oXvEEqCb/pub?start=false&loop=false&delayms=3000) and run the hotword stress test.
diff --git a/resources/device_config.common.ascii_proto b/resources/device_config.common.ascii_proto
index d8c85cc..305acae 100644
--- a/resources/device_config.common.ascii_proto
+++ b/resources/device_config.common.ascii_proto
@@ -59,7 +59,7 @@
 event {
   source: "LOGCAT"
   name: "assistant_started"
-  regex: "START.*com\.google\.android\.googlequicksearchbox.*opa\.OpaActivity.*|State changed: IDLE => FULL_LISTENING.*"
+  regex: "START.*com\.google\.android\.googlequicksearchbox.*opa\.OpaActivity.*|NGA starts FULL_LISTENING*"
 }
 
 event {
diff --git a/resources/heyg-us-female-make-a-call.wav b/resources/heyg-us-female-make-a-call.wav
new file mode 100644
index 0000000..9d45391
--- /dev/null
+++ b/resources/heyg-us-female-make-a-call.wav
Binary files differ
diff --git a/resources/heyg-us-female-set-a-timer-for-5-minutes.wav b/resources/heyg-us-female-set-a-timer-for-5-minutes.wav
new file mode 100644
index 0000000..8cbf847
--- /dev/null
+++ b/resources/heyg-us-female-set-a-timer-for-5-minutes.wav
Binary files differ
diff --git a/resources/heyg-us-female.wav b/resources/heyg-us-female.wav
index e431ed7..25574f3 100644
--- a/resources/heyg-us-female.wav
+++ b/resources/heyg-us-female.wav
Binary files differ
diff --git a/resources/okg-us-female-remind-me-to-water-my-plants-every-monday.wav b/resources/okg-us-female-remind-me-to-water-my-plants-every-monday.wav
new file mode 100644
index 0000000..c3196cf
--- /dev/null
+++ b/resources/okg-us-female-remind-me-to-water-my-plants-every-monday.wav
Binary files differ
diff --git a/resources/okg-us-female-whats-the-weather-tomorrow.wav b/resources/okg-us-female-whats-the-weather-tomorrow.wav
new file mode 100644
index 0000000..ecaf14c
--- /dev/null
+++ b/resources/okg-us-female-whats-the-weather-tomorrow.wav
Binary files differ
diff --git a/resources/okg-us-female.wav b/resources/okg-us-female.wav
index 5b3ba0f..7683e0e 100644
--- a/resources/okg-us-female.wav
+++ b/resources/okg-us-female.wav
Binary files differ
diff --git a/resources/stress_test.enroll_with_queries.ascii_proto b/resources/stress_test.enroll_with_queries.ascii_proto
new file mode 100644
index 0000000..7ba1c1e
--- /dev/null
+++ b/resources/stress_test.enroll_with_queries.ascii_proto
@@ -0,0 +1,39 @@
+description: "Simple script that plays Voice Match Phrases to enroll"
+
+# First phrase: Ok Google, what’s the weather tomorrow?
+step {
+  audio_file : "okg-us-female-whats-the-weather-tomorrow.wav"
+  audio_file_sample_rate : 24000
+  delay_after : 10
+}
+
+# Second phrase: Ok Google, remind me to water my plants every Monday.
+step {
+  audio_file : "okg-us-female-remind-me-to-water-my-plants-every-monday.wav"
+  audio_file_sample_rate : 24000
+  delay_after : 10
+}
+
+# Third phrase: Hey Google, make a call.
+step {
+  audio_file : "heyg-us-female-make-a-call.wav"
+  audio_file_sample_rate : 24000
+  delay_after : 10
+}
+
+# Fourth phrase: Hey Google, set a timer for 5 minutes.
+step {
+  audio_file : "heyg-us-female-set-a-timer-for-5-minutes.wav"
+  audio_file_sample_rate : 24000
+  delay_after : 10
+}
+
+expected_result {
+    aohd_hotword_detected : 0
+    assistant_started  : 0
+    dsp_false_accept  : 0
+    logcat_iteration  : 1
+    software_hotword  : 0
+    speaker_id_rejected  : 0
+    vis_software_hotword  : 0
+}