Need to add additional Fluid types in diagrams