Added a few annotations to specify table names and updated the template.