Updated MET with class number option  and CCL