Updated Fluid class