Removed use of ordered dictionary