Opt: Switch to CM definitions for Perf