[#336] Use ordered dict