Support wai-3