Improve data import flow.