updated CommandAndArgumentParser