improving NewSQLGenerator