Changes to import that will hopefully work on MSSQL