Use UUID instead of OrderedDict