Improve CSV backend