Added more tables to setup