Added command line splitting