fluid support

@ggarciajr