WAI 2.0 support #38