Added more support from command line.