Improve import routine