Added basic csv parsing