Improve PathUtility