Change implementation of data storage from dict of a dicto to list of dictionary.