[TIDOC-1898] Refactor export