Chabged SQL statements to use the new DB Schema