Merge "Refactor mongodb classes"