Refactoring, added MongoDB