Force existence checks against latest state
Adjust to new file creation