improved product data handling