More changes to database template.