Updated for new Zf Version