Made changes in the table names, columns for db