Added mechanism to deserialize internal map types.