OrderedDict for 2.6 added