Added a few more tables to the template database