The mongodb refactoring seems to work