Removed shelve in favor of json