Removed unused multi-map
Fixed the request to spec