"Changes to support custom CSV export"