Finished the refactor
Merge pull request #2286 from ten24/feature-taxintegration-ds

Feature taxintegration ds