Updating for zend conventions