Changes for non found files implemented