Added a couple of tables