improve importing system