Updated more tables