Prepared for upcoming switch to Path
switched from File to Path