added zend and datastore separation