Updated argparse implementation