Reararanged the command argument structure