Addine more tables and some changes to the SQL file