MongoDB, restructure of solution (bugzid:31)