Added fluid class