It's not clear from your response, so I'm just making sure. After adding the code for the new units, did you delete map.rwm again?