Improve Import function and design