1. Refined mapping
2. Better flow.
3. Added voucherID