Added more arginfo stuff