[ENHANCE] product configuration improvements