Updated to work with latest Zest snapshots - take 2