Minor refactoring of mongo model again