Added support for products to correspond with CorePro enhancements