Add CSV, other updates