Added support for product edition