Added argument processing by argparse