Changes to support MSSQL