Add waits for verification process