* Adjustment of file handling