Added dictionary with shelve support.