Added support for Product Set.