eval_keywords was deconstructing the hash
Add waits for verification process