Updates to handle Tax