Refornat and optimization of import.