Refactoring + support for named storage in UnitOfWork