Changed from OrderedDict to lists, as OrderedDict is not available in Python 2.6.