Enhance product FO for simple and variant