PathMatcher Improvements