Add automatic importing
Fix potential import overflow