Updated to Zend standard