Rework Import Query