Improve import partial products scenario