Added support for liquid products