Added command-line argument support