Updates for MWDL mapping.