Answer serialization now uses maps