Adding support to command line arguments