Added command-line interpretation