Add arguments only if they were passed in the CLI