Some changes to TaxCalculatorClient & TaxCalculatorServer