Refactored product numbers