Use new csv mapper instead of csv storage