Adding the rest of the tables