Improved speed of database import.