Added smarter command line arguments