Change pathFor to use this