[#3] Replaced request and response records for maps.