Improved plan support: products