Added taxcalculator and creditcardvalidator