Changed CSV parsing method