Move from using File to Path