Improve import functions