Better dfam to rm mapping