Now using shelve instead of MongoDB