minor changes in Zend1, DataStorage wip