Refactored product import