Expanded class hierarchy of FluidContainer