Simplify mapDN and mapDN2