Add Optional Host and NIC to Commands