fix cps whitelist, simplify two parameter definitions