Added command line argument handling