Updated to use stream interface for the csv parser