Changes for missing file handling