Path helper improvement
3 files changed