Re-add individual file support