Better manage product identifier