Once again simplify cli arguments mapper