Refactoring export tasks