Updated SQL statements