Changed dictionaries to Ordered dictionaries