Improved imports handling.