Build for wai3
Support WAI 3