Reworked for argparse version