Added command-line functionality