Added CFG lookup