Updated to zumi changes