Refactor to preserve order when exporting