Add more tables and entities