Updated SQL scripts