Added path expansion for filenames