Modifications to CSV mode