Update to support vat