Update command string to be more generic.