Updated Cli.Arguments to include Console hack/fix