Modify the Command, add enum Type