Added command line arguments support