Improved importing.