Stop passing in Map<String, Object> args.