Started mongo refactor