file_name now part of JSON as well