Added support for beverages