Add Client arguments and argument handling.