Add cmdline.arguments (UNTESTED!)