Changes to format of Commands