Implemented Map marshaling and unmarshaling