Changed the way liquids were handled, now independant from hard-coded materials