Add more comodities for command line.