Got to the point where the mapping is working again with the newer format.