Run, InvoicesMaker refactor