Added two more tables