Added command line functionality