Adjust to two argument KeystoneHelper