Handle passed paths to tree better