Updating models with minor adjustments to make the import process work better.