Import files improve