Added argparse argument handling