Refactored product imports