Added TE fluid support