Update Fluid mappings
Merge