File-handling changes for more complex analysis setups