Alter attribute assignment to allow for tax and extra tax-free component