Mongo model refactoring