Arg parser enhancements