Added better support for tax codes