Added Fluid Tank handling