Add the wrapArguments to facilitate plugins