Modify to include csv parser