Updated to Wai 2.0