Updated MOD mapping