Added command line args parsing