Adds voucher types as replacement for "voucher_needed" flag. Resolves #133.