Wai 2 compatibility