Add more tables, update column definitions