Improved dependency handling.
Improved compatibility of CSVReader.
Improved compatibility.