Added command line features