ashwin/lakshmi | #1638 Refactoring enhance export data story