Removed use of OrderedDict for Python2.6 compatibility