Refactoring zodb storage
Refactoring zodb storage