Added proper command line translation.