Moved prev_batch mapping to the map dict