Add "contract/pre-payment" option to Client