added templates, database