Setup basic host payment
Improved support for host payment