Use ordereddict and add more command argument