Updated tables.sql with new table layout