Refactored product upload