Made support for file handling