Changes map to be a multi-map using fluid-let for better syntax