Handle CSV upload better