Added structure to the template
Changed database name