Added FluidType generation