Added some more tables