Change FluidType into a class