Some adjustments in import controller