Added code to generate the rest of the tables