Added non-json file handling