Added PathExpression support.