Added ordered dictionary support