Added more Argparse changes