Adjust for WhenConditionAware using XPath