Added templates
Added templates