Improving auto-import