ravendb refactoring
ravendb refactoring