Make import process smoother