Change to support pathtree's new wildcard structure