Added some more columns to the tables