Added default templates
Extended template files