Replace OrderedDict with _MAP