FIX #117: Add support for liquid