Added command line configuration