Updated to support vanilla liquids - water and lava.