Updated MCC mapping and fixed errors