Update to work with WAI 3