Updating kiwi to use ES 1.0