More configuration controlled from command line.