Add more precise typing for OrderedDict