Close GH-12. Add fluid attribute