Updated for Zest version 0.9