Support new version of Kiwi