Improve import