Added templates and database