Refactoring for mongo structure v03