Continue work on #200 Taxes management