Improve API. Use new API on the Invoice form.