Added computeTax functionality